diff --git a/libraries/plugins/import/ImportSql.class.php b/libraries/plugins/import/ImportSql.class.php
index cd0943331e..3b080f1797 100644
--- a/libraries/plugins/import/ImportSql.class.php
+++ b/libraries/plugins/import/ImportSql.class.php
@@ -162,10 +162,11 @@ class ImportSql extends ImportPlugin
         }
 
         // Extracting remaining statements.
-        while ((!$error) && (!$timeout_passed)
-            && ($statement = $bq->extract(true))
-        ) {
-            PMA_importRunQuery($statement, $statement, false, $sql_data);
+        while ((!$error) && (!$timeout_passed) && (!empty($bq->query))) {
+            $statement = $bq->extract(true);
+            if (!empty($statement)) {
+                PMA_importRunQuery($statement, $statement, false, $sql_data);
+            }
         }
 
         // Finishing.