diff --git a/libraries/classes/DatabaseInterface.php b/libraries/classes/DatabaseInterface.php
index a7e47ae3f2..6730eed0df 100644
--- a/libraries/classes/DatabaseInterface.php
+++ b/libraries/classes/DatabaseInterface.php
@@ -3152,12 +3152,8 @@ class DatabaseInterface implements DbalInterface
      */
     public static function load(?DbiExtension $extension = null): self
     {
-        global $dbi;
-
         if ($extension !== null) {
-            $dbi = new self($extension);
-
-            return $dbi;
+            return new self($extension);
         }
 
         if (! self::checkDbExtension('mysqli')) {
@@ -3174,9 +3170,7 @@ class DatabaseInterface implements DbalInterface
             );
         }
 
-        $dbi = new self(new DbiMysqli());
-
-        return $dbi;
+        return new self(new DbiMysqli());
     }
 
     /**
diff --git a/libraries/common.inc.php b/libraries/common.inc.php
index 6af5caa56f..5e4d405d4f 100644
--- a/libraries/common.inc.php
+++ b/libraries/common.inc.php
@@ -348,7 +348,8 @@ if (! defined('PMA_MINIMUM_COMMON')) {
 
     ThemeManager::getInstance()->setThemeCookie();
 
-    $containerBuilder->set(DatabaseInterface::class, DatabaseInterface::load());
+    $dbi = DatabaseInterface::load();
+    $containerBuilder->set(DatabaseInterface::class, $dbi);
     $containerBuilder->setAlias('dbi', DatabaseInterface::class);
 
     if (! empty($cfg['Server'])) {
diff --git a/url.php b/url.php
index 4e0b022eef..f8785a4cfb 100644
--- a/url.php
+++ b/url.php
@@ -15,7 +15,7 @@ if (! defined('ROOT_PATH')) {
     // phpcs:enable
 }
 
-global $containerBuilder;
+global $containerBuilder, $dbi;
 
 // phpcs:disable PSR1.Files.SideEffects
 define('PMA_MINIMUM_COMMON', true);
@@ -24,7 +24,8 @@ define('PMA_MINIMUM_COMMON', true);
 require_once ROOT_PATH . 'libraries/common.inc.php';
 
 // Load database service because services.php is not available here
-$containerBuilder->set(DatabaseInterface::class, DatabaseInterface::load());
+$dbi = DatabaseInterface::load();
+$containerBuilder->set(DatabaseInterface::class, $dbi);
 
 // Only output the http headers
 $response = Response::getInstance();