diff --git a/libraries/classes/Plugins/Import/ImportCsv.php b/libraries/classes/Plugins/Import/ImportCsv.php
index 928491cf7d..1e1b168e83 100644
--- a/libraries/classes/Plugins/Import/ImportCsv.php
+++ b/libraries/classes/Plugins/Import/ImportCsv.php
@@ -723,18 +723,21 @@ class ImportCsv extends AbstractImportCsv
             }
 
             // check to see if {filename} as table exist
-            $nameArray = preg_grep('/' . $importFileName . '/isU', $result);
+            $nameArray = preg_grep('/^' . $importFileName . '$/isU', $result);
             // if no use filename as table name
             if ($nameArray === false || count($nameArray) === 0) {
                 return $importFileName;
             }
 
             // check if {filename}_ as table exist
-            $nameArray = preg_grep('/' . $importFileName . '_/isU', $result);
+            $nameArray = preg_grep('/^' . $importFileName . '_$/isU', $result);
             if ($nameArray === false) {
                 return $importFileName;
             }
 
+            // Filter for table names starting with the {filename}_ prefix
+            $nameArray = preg_grep('/^' . $importFileName . '_/isU', $result);
+
             return $importFileName . '_' . (count($nameArray) + 1);
         }