diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 500a5f73a6..21fa4c41e1 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -5257,7 +5257,7 @@ parameters:
 
 		-
 			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 4
+			count: 3
 			path: test/selenium/TestBase.php
 
 		-
@@ -5275,16 +5275,6 @@ parameters:
 			count: 1
 			path: test/selenium/TestBase.php
 
-		-
-			message: "#^Parameter \\#1 \\$json of function json_decode expects string, bool\\|string given\\.$#"
-			count: 1
-			path: test/selenium/TestBase.php
-
-		-
-			message: "#^Else branch is unreachable because previous condition is always true\\.$#"
-			count: 1
-			path: test/selenium/TestBase.php
-
 		-
 			message: "#^Parameter \\#1 \\$element of method PhpMyAdmin\\\\Tests\\\\Selenium\\\\TestBase\\:\\:moveto\\(\\) expects Facebook\\\\WebDriver\\\\Remote\\\\RemoteWebElement, Facebook\\\\WebDriver\\\\WebDriverElement given\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index d6320e0564..251d46bc03 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -513,11 +513,6 @@
     <ImplicitToStringCast occurrences="1">
       <code>$message</code>
     </ImplicitToStringCast>
-    <InvalidGlobal occurrences="3">
-      <code>global $what;</code>
-      <code>global $query_type;</code>
-      <code>global $mult_btn;</code>
-    </InvalidGlobal>
     <InvalidReturnStatement occurrences="1">
       <code>$partitionDetails</code>
     </InvalidReturnStatement>
@@ -543,17 +538,9 @@
       <code>$tmp_error</code>
       <code>$analyzed_sql_results ?? ''</code>
     </PossiblyInvalidArgument>
-    <PossiblyInvalidArrayAccess occurrences="5">
-      <code>$row['Key_name']</code>
-      <code>$row['Column_name']</code>
+    <PossiblyInvalidArrayAccess occurrences="1">
       <code>$expressions[$column]</code>
-      <code>$row['Key_name']</code>
-      <code>$row['Column_name']</code>
     </PossiblyInvalidArrayAccess>
-    <PossiblyNullArgument occurrences="2">
-      <code>$selected</code>
-      <code>$selected</code>
-    </PossiblyNullArgument>
     <PossiblyNullArrayAccess occurrences="14">
       <code>$data_size</code>
       <code>$data_unit</code>
@@ -570,12 +557,6 @@
       <code>$avg_size</code>
       <code>$avg_unit</code>
     </PossiblyNullArrayAccess>
-    <TypeDoesNotContainType occurrences="1">
-      <code>$result &amp;&amp; ! empty($sql_query_views)</code>
-    </TypeDoesNotContainType>
-    <UndefinedVariable occurrences="1">
-      <code>$what</code>
-    </UndefinedVariable>
   </file>
   <file src="libraries/classes/Controllers/Table/ZoomSearchController.php">
     <PossiblyFalseArgument occurrences="3">