diff --git a/libraries/entry_points/gis_data_editor.php b/libraries/entry_points/gis_data_editor.php
index 112f4ebe5c..333dfe2757 100644
--- a/libraries/entry_points/gis_data_editor.php
+++ b/libraries/entry_points/gis_data_editor.php
@@ -18,7 +18,8 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-global $containerBuilder;
+global $containerBuilder, $gis_data, $gis_types, $start, $geom_type, $gis_obj, $srid, $wkt, $wkt_with_zero;
+global $result, $visualizationSettings, $data, $visualization, $open_layers, $geom_count;
 
 /** @var Template $template */
 $template = $containerBuilder->get('template');
diff --git a/libraries/entry_points/home.php b/libraries/entry_points/home.php
index 26cf0fa808..8766e53e63 100644
--- a/libraries/entry_points/home.php
+++ b/libraries/entry_points/home.php
@@ -16,7 +16,7 @@ if (! defined('PHPMYADMIN')) {
     exit;
 }
 
-global $containerBuilder, $server;
+global $containerBuilder, $server, $show_query, $db, $table;
 
 /** @var Response $response */
 $response = $containerBuilder->get(Response::class);
@@ -67,8 +67,8 @@ if (isset($_POST['set_theme'])) {
     $response->addHTML($controller->gitRevision());
 } else {
     // Handles some variables that may have been sent by the calling script
-    $GLOBALS['db'] = '';
-    $GLOBALS['table'] = '';
+    $db = '';
+    $table = '';
     $show_query = '1';
 
     if ($server > 0) {