diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 1cbee4e387..4c9678edba 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -400,6 +400,11 @@ parameters:
 			count: 1
 			path: libraries/classes/Config/FormDisplay.php
 
+		-
+			message: "#^Cannot cast mixed to string\\.$#"
+			count: 1
+			path: libraries/classes/Config/FormDisplay.php
+
 		-
 			message: "#^Call to function function_exists\\(\\) with 'bzcompress'\\|'gzcompress'\\|'gzencode' will always evaluate to true\\.$#"
 			count: 1
@@ -455,11 +460,6 @@ parameters:
 			count: 1
 			path: libraries/classes/Config/FormDisplay.php
 
-		-
-			message: "#^Parameter \\#1 \\$string of static method PhpMyAdmin\\\\Sanitize\\:\\:escapeJsString\\(\\) expects string, mixed given\\.$#"
-			count: 2
-			path: libraries/classes/Config/FormDisplay.php
-
 		-
 			message: "#^Parameter \\#2 \\$array of function implode expects array\\<string\\>, mixed given\\.$#"
 			count: 1
@@ -7010,16 +7010,6 @@ parameters:
 			count: 4
 			path: libraries/classes/Sanitize.php
 
-		-
-			message: "#^Casting to string something that's already string\\.$#"
-			count: 2
-			path: libraries/classes/Sanitize.php
-
-		-
-			message: "#^Method PhpMyAdmin\\\\Sanitize\\:\\:escapeJsString\\(\\) should return string but returns string\\|null\\.$#"
-			count: 1
-			path: libraries/classes/Sanitize.php
-
 		-
 			message: "#^Method PhpMyAdmin\\\\Sanitize\\:\\:replaceBBLink\\(\\) has parameter \\$found with no value type specified in iterable type array\\.$#"
 			count: 1