diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
index f7c37814d9..5b772c649e 100644
--- a/libraries/classes/Config.php
+++ b/libraries/classes/Config.php
@@ -833,8 +833,6 @@ class Config
 
         $this->settings = array_replace_recursive($this->settings, $cfg);
 
-        $this->checkServers();
-
         return true;
     }
 
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index d23669507c..957b05991a 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -277,6 +277,8 @@ Core::checkRequest();
 /******************************************************************************/
 /* setup servers                                       LABEL_setup_servers    */
 
+$GLOBALS['PMA_Config']->checkServers();
+
 /**
  * current server
  * @global integer $GLOBALS['server']