diff --git a/htdocs/core/modules/import/import_csv.modules.php b/htdocs/core/modules/import/import_csv.modules.php
index 22c12024c2b..0fc2a6609cb 100644
--- a/htdocs/core/modules/import/import_csv.modules.php
+++ b/htdocs/core/modules/import/import_csv.modules.php
@@ -870,6 +870,10 @@ class ImportCsv extends ModeleImports
 										$filters[] = $col.' = '.$data[$key];
 									}
 								}
+								if (!empty($tablewithentity_cache[$tablename])) {
+									$where[] = "entity = ".((int) $conf->entity);
+									$filters[] = "entity = ".((int) $conf->entity);
+								}
 								$sqlSelect .= " WHERE ".implode(' AND ', $where);
 
 								$resql = $this->db->query($sqlSelect);
@@ -906,6 +910,10 @@ class ImportCsv extends ModeleImports
 								}
 								$sqlSelect .= " WHERE ".$keyfield." = ".((int) $lastinsertid);
 
+								if (!empty($tablewithentity_cache[$tablename])) {
+									$sqlSelect .= " AND entity = ".((int) $conf->entity);
+								}
+
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
 									$res = $this->db->fetch_object($resql);
@@ -951,6 +959,10 @@ class ImportCsv extends ModeleImports
 									$sqlend = " WHERE " . implode(' AND ', $where);
 								}
 
+								if (!empty($tablewithentity_cache[$tablename])) {
+									$sqlend .= " AND entity = ".((int) $conf->entity);
+								}
+
 								$sql = $sqlstart.$sqlend;
 
 								// Run update request
diff --git a/htdocs/core/modules/import/import_xlsx.modules.php b/htdocs/core/modules/import/import_xlsx.modules.php
index 35adc4476a0..ebfce90c26e 100644
--- a/htdocs/core/modules/import/import_xlsx.modules.php
+++ b/htdocs/core/modules/import/import_xlsx.modules.php
@@ -916,6 +916,10 @@ class ImportXlsx extends ModeleImports
 										$filters[] = $col.' = '.$data[$key];
 									}
 								}
+								if (!empty($tablewithentity_cache[$tablename])) {
+									$where[] = "entity = ".((int) $conf->entity);
+									$filters[] = "entity = ".((int) $conf->entity);
+								}
 								$sqlSelect .= " WHERE " . implode(' AND ', $where);
 
 								$resql = $this->db->query($sqlSelect);
@@ -953,6 +957,10 @@ class ImportXlsx extends ModeleImports
 								}
 								$sqlSelect .= " WHERE ".$keyfield." = ".((int) $lastinsertid);
 
+								if (!empty($tablewithentity_cache[$tablename])) {
+									$sqlSelect .= " AND entity = ".((int) $conf->entity);
+								}
+
 								$resql = $this->db->query($sqlSelect);
 								if ($resql) {
 									$res = $this->db->fetch_object($resql);
@@ -998,6 +1006,10 @@ class ImportXlsx extends ModeleImports
 									$sqlend = " WHERE " . implode(' AND ', $where);
 								}
 
+								if (!empty($tablewithentity_cache[$tablename])) {
+									$sqlend .= " AND entity = ".((int) $conf->entity);
+								}
+
 								$sql = $sqlstart . $sqlend;
 
 								// Run update request