diff --git a/htdocs/core/class/commonobject.class.php b/htdocs/core/class/commonobject.class.php
index 10e83d80595..03d044a2ee6 100644
--- a/htdocs/core/class/commonobject.class.php
+++ b/htdocs/core/class/commonobject.class.php
@@ -69,9 +69,7 @@ abstract class CommonObject
 
 		$sql = "SELECT rowid, ref, ref_ext";
 		$sql.= " FROM ".MAIN_DB_PREFIX.$element;
-		
-		if($conf->multicompany->enabled)$sql.= " WHERE entity=".$conf->entity; 
-		else $sql.=" WHERE 1 ";
+		$sql.= " WHERE entity IN (".getEntity($element).")" ; 
 		
 		if ($id > 0) $sql.= " AND rowid = ".$db->escape($id);
 		else if ($ref) $sql.= " AND ref = '".$db->escape($ref)."'";