diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 5b345bcc7..59b11323d 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -781,17 +781,12 @@ parameters:
 			path: src/Statements/RenameStatement.php
 
 		-
-			message: "#^Parameter \\#1 \\$component of static method PhpMyAdmin\\\\SqlParser\\\\Components\\\\Array2d\\:\\:build\\(\\) expects array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\>, PhpMyAdmin\\\\SqlParser\\\\Components\\\\Array2d given\\.$#"
+			message: "#^Parameter \\#1 \\$component of static method PhpMyAdmin\\\\SqlParser\\\\Components\\\\Array2d\\:\\:build\\(\\) expects array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\>, array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\Array2d\\> given\\.$#"
 			count: 1
 			path: src/Statements/ReplaceStatement.php
 
 		-
-			message: "#^Parameter \\#1 \\$var of function count expects array\\|Countable, PhpMyAdmin\\\\SqlParser\\\\Components\\\\Array2d given\\.$#"
-			count: 1
-			path: src/Statements/ReplaceStatement.php
-
-		-
-			message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\ReplaceStatement\\:\\:\\$values \\(PhpMyAdmin\\\\SqlParser\\\\Components\\\\Array2d\\|null\\) does not accept array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\>\\.$#"
+			message: "#^Property PhpMyAdmin\\\\SqlParser\\\\Statements\\\\ReplaceStatement\\:\\:\\$values \\(array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\Array2d\\>\\|null\\) does not accept array\\<PhpMyAdmin\\\\SqlParser\\\\Components\\\\ArrayObj\\>\\.$#"
 			count: 1
 			path: src/Statements/ReplaceStatement.php
 
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 116d55268..6ab827d47 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -1074,8 +1074,7 @@
     </InvalidArgument>
   </file>
   <file src="src/Statements/ReplaceStatement.php">
-    <InvalidArgument occurrences="2">
-      <code>$this-&gt;values</code>
+    <InvalidArgument occurrences="1">
       <code>$this-&gt;values</code>
     </InvalidArgument>
     <InvalidPropertyAssignmentValue occurrences="1">
diff --git a/src/Statements/ReplaceStatement.php b/src/Statements/ReplaceStatement.php
index 9eb2c45dc..0c2db21b5 100644
--- a/src/Statements/ReplaceStatement.php
+++ b/src/Statements/ReplaceStatement.php
@@ -61,7 +61,7 @@ class ReplaceStatement extends Statement
     /**
      * Values to be replaced.
      *
-     * @var Array2d|null
+     * @var Array2d[]|null
      */
     public $values;