diff --git a/libraries/classes/CheckUserPrivileges.php b/libraries/classes/CheckUserPrivileges.php
index 4eb238269f..d3be83e5c7 100644
--- a/libraries/classes/CheckUserPrivileges.php
+++ b/libraries/classes/CheckUserPrivileges.php
@@ -154,7 +154,6 @@ class CheckUserPrivileges
             $GLOBALS['is_create_db_priv'] = SessionCache::get('is_create_db_priv');
             $GLOBALS['is_reload_priv'] = SessionCache::get('is_reload_priv');
             $GLOBALS['db_to_create'] = SessionCache::get('db_to_create');
-            $GLOBALS['dbs_where_create_table_allowed'] = SessionCache::get('dbs_where_create_table_allowed');
             $GLOBALS['dbs_to_test'] = SessionCache::get('dbs_to_test');
 
             $GLOBALS['db_priv'] = SessionCache::get('db_priv');
@@ -169,7 +168,6 @@ class CheckUserPrivileges
         $GLOBALS['is_create_db_priv'] = false;
         $GLOBALS['is_reload_priv'] = false;
         $GLOBALS['db_to_create'] = '';
-        $GLOBALS['dbs_where_create_table_allowed'] = [];
         $GLOBALS['dbs_to_test'] = Utilities::getSystemSchemas();
         $GLOBALS['proc_priv'] = false;
         $GLOBALS['db_priv'] = false;
@@ -221,15 +219,11 @@ class CheckUserPrivileges
                 $GLOBALS['is_create_db_priv'] = true;
                 $GLOBALS['is_reload_priv'] = true;
                 $GLOBALS['db_to_create'] = '';
-                $GLOBALS['dbs_where_create_table_allowed'][] = '*';
                 // @todo we should not break here, cause GRANT ALL *.*
                 // could be revoked by a later rule like GRANT SELECT ON db.*
                 break;
             }
 
-            // this array may contain wildcards
-            $GLOBALS['dbs_where_create_table_allowed'][] = $showGrantsDbName;
-
             $dbNameToTest = Util::backquote($showGrantsDbName);
 
             if ($GLOBALS['is_create_db_priv']) {
@@ -274,7 +268,6 @@ class CheckUserPrivileges
         SessionCache::set('is_create_db_priv', $GLOBALS['is_create_db_priv']);
         SessionCache::set('is_reload_priv', $GLOBALS['is_reload_priv']);
         SessionCache::set('db_to_create', $GLOBALS['db_to_create']);
-        SessionCache::set('dbs_where_create_table_allowed', $GLOBALS['dbs_where_create_table_allowed']);
         SessionCache::set('dbs_to_test', $GLOBALS['dbs_to_test']);
 
         SessionCache::set('proc_priv', $GLOBALS['proc_priv']);
@@ -300,7 +293,6 @@ class CheckUserPrivileges
             $GLOBALS['is_create_db_priv'] = true;
             $GLOBALS['is_reload_priv'] = true;
             $GLOBALS['db_to_create'] = '';
-            $GLOBALS['dbs_where_create_table_allowed'] = ['*'];
             $GLOBALS['dbs_to_test'] = false;
             $GLOBALS['db_priv'] = true;
             $GLOBALS['col_priv'] = true;
diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
index 2156a7d2c2..d1229b457d 100644
--- a/libraries/classes/Plugins/Auth/AuthenticationCookie.php
+++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php
@@ -381,7 +381,6 @@ class AuthenticationCookie extends AuthenticationPlugin
             SessionCache::remove('is_create_db_priv');
             SessionCache::remove('is_reload_priv');
             SessionCache::remove('db_to_create');
-            SessionCache::remove('dbs_where_create_table_allowed');
             SessionCache::remove('dbs_to_test');
             SessionCache::remove('db_priv');
             SessionCache::remove('col_priv');
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 1460709de8..f3bc731dc7 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -132,7 +132,6 @@
       <code><![CDATA[$GLOBALS['db_priv']]]></code>
       <code><![CDATA[$GLOBALS['db_to_create']]]></code>
       <code><![CDATA[$GLOBALS['dbs_to_test']]]></code>
-      <code><![CDATA[$GLOBALS['dbs_where_create_table_allowed']]]></code>
       <code><![CDATA[$GLOBALS['is_create_db_priv']]]></code>
       <code><![CDATA[$GLOBALS['is_reload_priv']]]></code>
       <code><![CDATA[$GLOBALS['proc_priv']]]></code>