diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 585f7d6d97..ace5573119 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -236,13 +236,13 @@ parameters:
 			path: libraries/classes/Controllers/Server/Status/StatusController.php
 
 		-
-			message: "#^Parameter \\#2 \\$pieces of function implode expects array, array\\|null given\\.$#"
-			count: 2
+			message: "#^Offset 1 does not exist on array\\|null\\.$#"
+			count: 3
 			path: libraries/classes/Controllers/Server/VariablesController.php
 
 		-
-			message: "#^Offset 1 does not exist on array\\|null\\.$#"
-			count: 3
+			message: "#^Parameter \\#2 \\$pieces of function implode expects array, array\\|null given\\.$#"
+			count: 2
 			path: libraries/classes/Controllers/Server/VariablesController.php
 
 		-
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 1489a6a372..19ae8919f6 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -385,9 +385,7 @@
     <PossiblyNullArgument occurrences="7"/>
   </file>
   <file src="libraries/classes/Controllers/Server/VariablesController.php">
-    <PossiblyNullArgument occurrences="5">
-      <code>$value</code>
-      <code>$value</code>
+    <PossiblyNullArgument occurrences="3">
       <code>$varValue[1]</code>
       <code>Util::formatByteDown($value, 3, 3)</code>
       <code>Util::formatByteDown($varValue[1], 3, 3)</code>
@@ -396,9 +394,6 @@
       <code>$varValue[1]</code>
       <code>$varValue[1]</code>
     </PossiblyNullArrayAccess>
-    <PossiblyUndefinedArrayOffset occurrences="1">
-      <code>$params['varName']</code>
-    </PossiblyUndefinedArrayOffset>
   </file>
   <file src="libraries/classes/Controllers/Setup/FormController.php">
     <PossiblyNullArgument occurrences="1">
@@ -607,10 +602,8 @@
     </PossiblyNullPropertyAssignmentValue>
   </file>
   <file src="libraries/classes/Database/Routines.php">
-    <InvalidScalarArgument occurrences="1">
+    <PossiblyInvalidArgument occurrences="3">
       <code>$affected</code>
-    </InvalidScalarArgument>
-    <PossiblyInvalidArgument occurrences="2">
       <code>$routine['item_returntype']</code>
       <code>$routine['item_type_toggle']</code>
     </PossiblyInvalidArgument>
@@ -2412,9 +2405,6 @@
       <code>$filter_ts_to</code>
       <code>$filter_ts_to</code>
     </InvalidScalarArgument>
-    <NullArgument occurrences="1">
-      <code>null</code>
-    </NullArgument>
   </file>
   <file src="libraries/classes/Transformations.php">
     <InvalidArgument occurrences="2">