diff --git a/htdocs/core/class/extrafields.class.php b/htdocs/core/class/extrafields.class.php
index cf35dd1ee5c182ace959c21627db12f3f37d8271..52c3b2f5cb988f040095755ad177a909e8da7696 100644
--- a/htdocs/core/class/extrafields.class.php
+++ b/htdocs/core/class/extrafields.class.php
@@ -1232,9 +1232,11 @@ class ExtraFields
 			{
 				$sql.= ' as main';
 			}
-			if ($selectkey=='rowid') {
+			if ($selectkey=='rowid' && empty($value)) {
+				$sql.= " WHERE ".$selectkey."=0";
+			} elseif ($selectkey=='rowid') {
 				$sql.= " WHERE ".$selectkey."=".$this->db->escape($value);
-			} else {
+			}else {
 				$sql.= " WHERE ".$selectkey."='".$this->db->escape($value)."'";
 			}