diff --git a/ChangeLog b/ChangeLog
index 821ffe9085..d272af2365 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -54,6 +54,7 @@ phpMyAdmin - ChangeLog
 + rfe #1547 Wrap No Tables Found message with message box
 - bug #4559 Logging in causes 100% CPU usage
 - bug #4564 Designer: spaces in table name with edit table link generates bad links
+- bug #4495 Comment lines in multiquery
 
 4.2.12.0 (not yet released)
 - bug #4574 Blank/white page when JavaScript disabled
diff --git a/libraries/plugins/import/ImportSql.class.php b/libraries/plugins/import/ImportSql.class.php
index 62f3e7ae91..c819b06c6b 100644
--- a/libraries/plugins/import/ImportSql.class.php
+++ b/libraries/plugins/import/ImportSql.class.php
@@ -296,6 +296,11 @@ class ImportSql extends ImportPlugin
                     //throw new Exception('Unknown case.');
                     break;
                 }
+
+                if (0 === $this->_firstSearchChar) {
+                    $this->_queryBeginPosition = $this->_delimiterPosition;
+                }
+
                 continue;
             }