diff --git a/libraries/classes/Sql.php b/libraries/classes/Sql.php
index f7e03b08f2..5e3f241af7 100644
--- a/libraries/classes/Sql.php
+++ b/libraries/classes/Sql.php
@@ -21,6 +21,7 @@ use PhpMyAdmin\SqlParser\Utils\Query;
 use PhpMyAdmin\Utils\ForeignKey;
 
 use function __;
+use function array_key_exists;
 use function array_keys;
 use function array_map;
 use function bin2hex;
@@ -198,7 +199,7 @@ class Sql
             foreach (array_keys($indexColumns) as $indexColumnName) {
                 if (
                     ! in_array($indexColumnName, $resultSetColumnNames)
-                    && in_array($indexColumnName, $columns)
+                    && array_key_exists($indexColumnName, $columns)
                     && ! str_contains($columns[$indexColumnName]['Extra'], 'INVISIBLE')
                 ) {
                     continue;
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 2838a68906..955301ac82 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -13265,9 +13265,6 @@
       <code>$_SESSION['tmpval']['possible_as_geometry']</code>
       <code>$statement-&gt;expr[0]</code>
     </MixedArrayAssignment>
-    <MixedArrayTypeCoercion occurrences="1">
-      <code>$columns[$indexColumnName]</code>
-    </MixedArrayTypeCoercion>
     <MixedAssignment occurrences="21">
       <code>$maxRows</code>
       <code>$oneFieldMeta</code>