diff --git a/etemplate/js/et2_widget_selectbox.js b/etemplate/js/et2_widget_selectbox.js
index 39d09c1265..84ad4475b8 100644
--- a/etemplate/js/et2_widget_selectbox.js
+++ b/etemplate/js/et2_widget_selectbox.js
@@ -1119,7 +1119,9 @@ jQuery.extend(et2_selectbox,
 		else
 		{
 			// Check that the value is in there
-			if(attrs.value)
+			// Make sure we are not requesting server for an empty value option
+			// as server won't find anything and it will fall into an infinitive loop
+			if(attrs.value && attrs.value != "" && attrs.value != "0")
 			{
 				var missing_option = true;
 				for(var i = 0; i < cache.length && missing_option; i++)