diff --git a/htdocs/admin/const.php b/htdocs/admin/const.php
index a64e3856dbc..fc7fbc74f4d 100644
--- a/htdocs/admin/const.php
+++ b/htdocs/admin/const.php
@@ -230,7 +230,7 @@ $sql.= ", entity";
 $sql.= " FROM ".MAIN_DB_PREFIX."const";
 $sql.= " WHERE entity IN (".$user->entity.",".$conf->entity.")";
 if (empty($user->entity) && $debug) {} // to force for superadmin
-elseif ($user->entity || empty($conf->multicompany->enabled)) $sql.= " AND visible = 1";
+else $sql.= " AND visible = 1";			// We must always have this. Otherwise, array is too large and submitting data fails due to apache POST or GET limits
 $sql.= " ORDER BY entity, name ASC";
 
 dol_syslog("Const::listConstant", LOG_DEBUG);
@@ -280,7 +280,6 @@ if ($result)
 		if ($conf->use_javascript_ajax)
 		{
 			print '<input type="checkbox" class="flat checkboxfordelete" id="check_'.$i.'" name="const['.$i.'][check]" value="1">';
-			print ' &nbsp; ';
 		}
 		else
 		{