diff --git a/htdocs/fourn/facture/list.php b/htdocs/fourn/facture/list.php
index 357df92a4eb..2a01602eadc 100644
--- a/htdocs/fourn/facture/list.php
+++ b/htdocs/fourn/facture/list.php
@@ -150,7 +150,7 @@ if ($filter && $filter != -1)		// GETPOST('filtre') may be a string
 
 if ($search_ref)
 {
-	if (is_numeric($search_ref)) $sql .= natural_search(array('fac.rowid', 'fac.ref'), $search_ref);// For backward compatibility
+	if (is_numeric($search_ref)) $sql .= natural_search(array('fac.ref'), $search_ref);
 	else $sql .= natural_search('fac.ref', $search_ref);
 }
 if (search_ref_supplier)
diff --git a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
index e2c586de47f..2281793929f 100755
--- a/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
+++ b/htdocs/install/mysql/migration/3.6.0-3.7.0.sql
@@ -1136,6 +1136,8 @@ ALTER TABLE llx_facture_fourn MODIFY COLUMN ref VARCHAR(255);
 ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_ext VARCHAR(255);
 ALTER TABLE llx_facture_fourn MODIFY COLUMN ref_supplier VARCHAR(255);
 
+UPDATE llx_facture_fourn SET ref = rowid WHERE ref IS NULL or ref = '';
+
 ALTER TABLE llx_facture_rec ADD COLUMN revenuestamp double(24,8) DEFAULT 0;
 ALTER TABLE llx_facturedet_rec MODIFY COLUMN tva_tx double(6,3);
 ALTER TABLE llx_facturedet_rec ADD COLUMN fk_contract_line integer NULL;