diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index f6fd2a87e005..cbef42252893 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -375,11 +375,6 @@ parameters:
 			count: 6
 			path: libraries/classes/Controllers/Database/OperationsController.php
 
-		-
-			message: "#^Parameter \\#1 \\$message of static method PhpMyAdmin\\\\Html\\\\Generator\\:\\:getMessage\\(\\) expects PhpMyAdmin\\\\Message\\|string, null given\\.$#"
-			count: 1
-			path: libraries/classes/Controllers/Database/OperationsController.php
-
 		-
 			message: "#^Unreachable statement \\- code above always terminates\\.$#"
 			count: 1
@@ -475,11 +470,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Controllers/Server/DatabasesController.php
 
-		-
-			message: "#^Parameter \\#1 \\$message of static method PhpMyAdmin\\\\Html\\\\Generator\\:\\:getMessage\\(\\) expects PhpMyAdmin\\\\Message\\|string, null given\\.$#"
-			count: 1
-			path: libraries/classes/Controllers/Server/DatabasesController.php
-
 		-
 			message: "#^Strict comparison using \\=\\=\\= between mixed and null will always evaluate to false\\.$#"
 			count: 1
@@ -3660,11 +3650,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Server/Privileges.php
 
-		-
-			message: "#^Parameter \\#1 \\$message of static method PhpMyAdmin\\\\Html\\\\Generator\\:\\:getMessage\\(\\) expects PhpMyAdmin\\\\Message\\|string, null given\\.$#"
-			count: 1
-			path: libraries/classes/Server/Privileges.php
-
 		-
 			message: "#^Parameter \\#2 \\.\\.\\.\\$args of function array_merge expects array, \\(array\\)\\|true given\\.$#"
 			count: 3
@@ -5100,11 +5085,6 @@ parameters:
 			count: 1
 			path: test/classes/Properties/PropertyItemTest.php
 
-		-
-			message: "#^Parameter \\#1 \\$message of static method PhpMyAdmin\\\\Html\\\\Generator\\:\\:getMessage\\(\\) expects PhpMyAdmin\\\\Message\\|string, null given\\.$#"
-			count: 1
-			path: test/classes/Server/PrivilegesTest.php
-
 		-
 			message: "#^Parameter \\#1 \\$needle of method PHPUnit\\\\Framework\\\\Assert\\:\\:assertStringContainsString\\(\\) expects string, bool\\|string given\\.$#"
 			count: 1
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 0c8e6752cf98..f91e6487c89b 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -233,9 +233,6 @@
     </PossiblyNullArgument>
   </file>
   <file src="libraries/classes/Controllers/Database/OperationsController.php">
-    <NullArgument occurrences="1">
-      <code>null</code>
-    </NullArgument>
     <TypeDoesNotContainType occurrences="1">
       <code>$sub_part</code>
     </TypeDoesNotContainType>
@@ -376,9 +373,6 @@
     </PossiblyNullIterator>
   </file>
   <file src="libraries/classes/Controllers/Server/DatabasesController.php">
-    <NullArgument occurrences="1">
-      <code>null</code>
-    </NullArgument>
     <PossiblyInvalidArgument occurrences="1">
       <code>$this-&gt;dbi-&gt;getError()</code>
     </PossiblyInvalidArgument>
@@ -2296,8 +2290,7 @@
       <code>$result</code>
       <code>$result</code>
     </InvalidArgument>
-    <NullArgument occurrences="3">
-      <code>null</code>
+    <NullArgument occurrences="2">
       <code>null</code>
       <code>null</code>
     </NullArgument>