diff --git a/src/Controllers/Import/ImportController.php b/src/Controllers/Import/ImportController.php
index aad79613f2..2855036ad1 100644
--- a/src/Controllers/Import/ImportController.php
+++ b/src/Controllers/Import/ImportController.php
@@ -682,6 +682,13 @@ final class ImportController extends AbstractController
             return null;
         }
 
+        if ($request->hasBodyParam('rollback_query')) {
+            // We rollback because there might be other queries that need to be executed after this,
+            // e.g. creation of a bookmark.
+            $this->dbi->query('ROLLBACK');
+            ImportSettings::$message .= __('[ROLLBACK occurred.]');
+        }
+
         if ($GLOBALS['result']) {
             // Save a Bookmark with more than one queries (if Bookmark label given).
             if (! empty($request->getParsedBodyParam('bkm_label')) && ! empty($GLOBALS['import_text'])) {
@@ -711,11 +718,6 @@ final class ImportController extends AbstractController
             include ROOT_PATH . $GLOBALS['goto'];
         }
 
-        // If there is request for ROLLBACK in the end.
-        if ($request->hasBodyParam('rollback_query')) {
-            $this->dbi->query('ROLLBACK');
-        }
-
         return null;
     }
 }
diff --git a/src/Import/Import.php b/src/Import/Import.php
index fa6bcd7b6f..dfef41c653 100644
--- a/src/Import/Import.php
+++ b/src/Import/Import.php
@@ -240,13 +240,6 @@ class Import
 
         // Do we have something to push into buffer?
         $this->importRunBuffer = $sql !== '' ? $sql . ';' : null;
-
-        // In case of ROLLBACK, notify the user.
-        if (! isset($_POST['rollback_query'])) {
-            return;
-        }
-
-        ImportSettings::$message .= __('[ROLLBACK occurred.]');
     }
 
     /**