diff --git a/libraries/classes/Util.php b/libraries/classes/Util.php
index 076807893b..616d42fa5a 100644
--- a/libraries/classes/Util.php
+++ b/libraries/classes/Util.php
@@ -1581,21 +1581,16 @@ class Util
         if (str_contains($string, '@COLUMNS@')) {
             $columnsList = $GLOBALS['dbi']->getColumns($GLOBALS['db'], $GLOBALS['table']);
 
-            // sometimes the table no longer exists at this point
-            if ($columnsList !== null) {
-                $columnNames = [];
-                foreach ($columnsList as $column) {
-                    if ($escape !== null) {
-                        $columnNames[] = self::$escape($column['Field']);
-                    } else {
-                        $columnNames[] = $column['Field'];
-                    }
+            $columnNames = [];
+            foreach ($columnsList as $column) {
+                if ($escape !== null) {
+                    $columnNames[] = self::$escape($column['Field']);
+                } else {
+                    $columnNames[] = $column['Field'];
                 }
-
-                $replace['@COLUMNS@'] = implode(',', $columnNames);
-            } else {
-                $replace['@COLUMNS@'] = '*';
             }
+
+            $replace['@COLUMNS@'] = implode(',', $columnNames);
         }
 
         /* Do the replacement */
diff --git a/psalm-baseline.xml b/psalm-baseline.xml
index 156d3b4852..1bab2fde7e 100644
--- a/psalm-baseline.xml
+++ b/psalm-baseline.xml
@@ -13895,9 +13895,6 @@
       <code>(int) $timestamp</code>
       <code>(int) $timestamp</code>
     </RedundantCastGivenDocblockType>
-    <RedundantCondition occurrences="1">
-      <code>$columnsList !== null</code>
-    </RedundantCondition>
   </file>
   <file src="libraries/classes/Utils/ForeignKey.php">
     <RedundantCastGivenDocblockType occurrences="1">