diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 8b1ae51ba1..16eb83e9ac 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -937,10 +937,8 @@ if (! defined('PMA_MINIMUM_COMMON')
     }
     $cfgRelation = PMA_getRelationsParam();
     if (empty($cfgRelation['db'])) {
-        foreach ($GLOBALS['dblist']->databases as $database) {
-            if ($database == 'phpmyadmin') {
-                PMA_fixPMATables($database, false);
-            }
+        if ($GLOBALS['dblist']->databases->exists('phpmyadmin')) {
+            PMA_fixPMATables('phpmyadmin', false);
         }
     }
 }