diff --git a/export.php b/export.php
index c860e759b3..aa73168d57 100644
--- a/export.php
+++ b/export.php
@@ -24,7 +24,7 @@ if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-global $db;
+global $db, $sql_query;
 
 include_once ROOT_PATH . 'libraries/common.inc.php';
 
diff --git a/libraries/classes/Controllers/Table/StructureController.php b/libraries/classes/Controllers/Table/StructureController.php
index 70b83ca4f9..62dc2e5a38 100644
--- a/libraries/classes/Controllers/Table/StructureController.php
+++ b/libraries/classes/Controllers/Table/StructureController.php
@@ -136,6 +136,8 @@ class StructureController extends AbstractController
      */
     public function indexAction()
     {
+        global $sql_query;
+
         PageSettings::showGroup('TableStructure');
 
         $checkUserPrivileges = new CheckUserPrivileges($this->dbi);
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index a952209ca7..f96ead874c 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -15,7 +15,7 @@ parameters:
         - '#Access to an undefined property PhpMyAdmin\\TwoFactor\:\:\$(backend|showSubmit|available|writable)#'
         - '#Call to an undefined method PhpMyAdmin\\Navigation\\Nodes\\Node\:\:getHiddenCount#'
         - '#Undefined variable: \$array#'
-        - '#Undefined variable: \$(sql_query|export_type|err_url|collation_connection|filename_template|transform_key|cn|goto|token_mismatch|auth_plugin|username|hostname|display_query)#'#Others
+        - '#Undefined variable: \$(export_type|err_url|collation_connection|filename_template|transform_key|cn|goto|token_mismatch|auth_plugin|username|hostname|display_query)#'#Others
         - '#Undefined variable: \$(unsaved_values|is_upload)#'#tbl_change.php
         - '#Undefined variable: \$max_upload_size#'#tbl_import.php
         - '#Undefined variable: \$(repobase|fullrevision|revision|repobranchbase|branch)#'#Footer.php
diff --git a/tbl_row_action.php b/tbl_row_action.php
index 62fe6fa74e..b26f1ecf89 100644
--- a/tbl_row_action.php
+++ b/tbl_row_action.php
@@ -15,7 +15,7 @@ if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-global $db, $pmaThemeImage, $table;
+global $db, $pmaThemeImage, $sql_query, $table;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
diff --git a/view_operations.php b/view_operations.php
index dbfbd91bb1..a61660f8bc 100644
--- a/view_operations.php
+++ b/view_operations.php
@@ -21,7 +21,7 @@ if (! defined('ROOT_PATH')) {
     define('ROOT_PATH', __DIR__ . DIRECTORY_SEPARATOR);
 }
 
-global $url_query;
+global $sql_query, $url_query;
 
 require_once ROOT_PATH . 'libraries/common.inc.php';