diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 7a774b908e..ddaebefa16 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -5490,6 +5490,16 @@ parameters:
 			count: 1
 			path: src/Controllers/Table/ChangeController.php
 
+		-
+			message: "#^Binary operation \"\\+\" between int\\|string and mixed results in an error\\.$#"
+			count: 1
+			path: src/Controllers/Table/ChartController.php
+
+		-
+			message: "#^Binary operation \"\\-\" between int\\|string and mixed results in an error\\.$#"
+			count: 1
+			path: src/Controllers/Table/ChartController.php
+
 		-
 			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
 			count: 1
@@ -5521,7 +5531,7 @@ parameters:
 			path: src/Controllers/Table/ChartController.php
 
 		-
-			message: "#^Parameter \\#1 \\$rowCount of class PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit constructor expects int, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$rowCount of class PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit constructor expects int\\|string, mixed given\\.$#"
 			count: 2
 			path: src/Controllers/Table/ChartController.php
 
@@ -5536,13 +5546,8 @@ parameters:
 			path: src/Controllers/Table/ChartController.php
 
 		-
-			message: "#^Parameter \\#2 \\$offset of class PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit constructor expects int, \\(float\\|int\\) given\\.$#"
-			count: 1
-			path: src/Controllers/Table/ChartController.php
-
-		-
-			message: "#^Parameter \\#2 \\$offset of class PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit constructor expects int, mixed given\\.$#"
-			count: 1
+			message: "#^Parameter \\#2 \\$offset of class PhpMyAdmin\\\\SqlParser\\\\Components\\\\Limit constructor expects int\\|string, mixed given\\.$#"
+			count: 2
 			path: src/Controllers/Table/ChartController.php
 
 		-
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 59cf765fd1..f34e75ebbf 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -3335,9 +3335,6 @@
       <code>Config::getInstance()</code>
     </DeprecatedMethod>
     <InvalidArgument>
-      <code><![CDATA[$_REQUEST['pos']]]></code>
-      <code><![CDATA[$_REQUEST['session_max_rows']]]></code>
-      <code>$rows</code>
       <code>$start</code>
     </InvalidArgument>
     <InvalidArrayOffset>
@@ -3348,6 +3345,11 @@
       <code><![CDATA[$GLOBALS['errorUrl']]]></code>
       <code><![CDATA[$GLOBALS['errorUrl']]]></code>
     </MixedAssignment>
+    <PossiblyInvalidArgument>
+      <code><![CDATA[$_REQUEST['pos']]]></code>
+      <code><![CDATA[$_REQUEST['session_max_rows']]]></code>
+      <code>$rows</code>
+    </PossiblyInvalidArgument>
     <PossiblyInvalidOperand>
       <code><![CDATA[$_REQUEST['pos']]]></code>
       <code><![CDATA[$_REQUEST['pos']]]></code>