diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index c3163ceb46..78b3f473a5 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -4125,11 +4125,6 @@ parameters:
 			count: 3
 			path: src/Controllers/Table/GisVisualizationController.php
 
-		-
-			message: "#^Method PhpMyAdmin\\\\Controllers\\\\Table\\\\GisVisualizationController\\:\\:getVisualizationSettings\\(\\) should return array\\{spatialColumn\\: string, labelColumn\\?\\: string\\} but returns array\\{labelColumn\\?\\: string, spatialColumn\\: mixed\\}\\.$#"
-			count: 1
-			path: src/Controllers/Table/GisVisualizationController.php
-
 		-
 			message: "#^Parameter \\#2 \\$format of method PhpMyAdmin\\\\Gis\\\\GisVisualization\\:\\:toFile\\(\\) expects string, mixed given\\.$#"
 			count: 1
diff --git a/src/Controllers/Table/GisVisualizationController.php b/src/Controllers/Table/GisVisualizationController.php
index 16eeb0ef36..f693583205 100644
--- a/src/Controllers/Table/GisVisualizationController.php
+++ b/src/Controllers/Table/GisVisualizationController.php
@@ -225,9 +225,14 @@ final class GisVisualizationController implements InvocableController
         }
 
         // If spatial column is not set, use first geometric column as spatial column
-        $spatialColumnValid = isset($settingsIn['spatialColumn']) &&
-            in_array($settingsIn['spatialColumn'], $spatialCandidates, true);
-        $settings['spatialColumn'] = $spatialColumnValid ? $settingsIn['spatialColumn'] : $spatialCandidates[0];
+        if (
+            isset($settingsIn['spatialColumn']) &&
+            in_array($settingsIn['spatialColumn'], $spatialCandidates, true)
+        ) {
+            $settings['spatialColumn'] = $settingsIn['spatialColumn'];
+        } else {
+            $settings['spatialColumn'] = $spatialCandidates[0];
+        }
 
         return $settings;
     }