diff --git a/src/QueryReflection/QueryReflection.php b/src/QueryReflection/QueryReflection.php
index cb97c5ed1..2e67033e4 100644
--- a/src/QueryReflection/QueryReflection.php
+++ b/src/QueryReflection/QueryReflection.php
@@ -34,6 +34,7 @@
 use staabm\PHPStanDba\SchemaReflection\SchemaReflection;
 use staabm\PHPStanDba\SqlAst\ParserInference;
 use staabm\PHPStanDba\UnresolvableQueryException;
+use staabm\PHPStanDba\UnresolvableQueryDynamicFromException;
 
 final class QueryReflection
 {
@@ -280,13 +281,7 @@ public function resolveQueryStrings(Expr $queryExpr, Scope $scope): iterable
 
         $queryString = $this->resolveQueryExpr($queryExpr, $scope);
         if (null !== $queryString) {
-            $normalizedQuery = QuerySimulation::stripComments($this->normalizeQueryString($queryString));
-
-            // query simulation might lead in a invalid query, skip those
-            $error = $this->validateQueryString($normalizedQuery);
-            if ($error === null) {
-                yield $normalizedQuery;
-            }
+            yield QuerySimulation::stripComments($this->normalizeQueryString($queryString));
         }
     }
 
@@ -360,6 +355,13 @@ private function resolveQueryStringExpr(Expr $queryExpr, Scope $scope, bool $res
             $leftString = $this->resolveQueryStringExpr($left, $scope);
             $rightString = $this->resolveQueryStringExpr($right, $scope);
 
+            // queries with a dynamic FROM are not resolvable
+            if (QueryReflection::getRuntimeConfiguration()->isDebugEnabled()) {
+                if (str_ends_with(rtrim($leftString), 'FROM') && is_numeric(trim($rightString, '"\''))) {
+                    throw new UnresolvableQueryDynamicFromException('Seems the query is too dynamic to be resolved by query simulation');
+                }
+            }
+
             if (null === $leftString || null === $rightString) {
                 return null;
             }
diff --git a/src/UnresolvableQueryDynamicFromException.php b/src/UnresolvableQueryDynamicFromException.php
new file mode 100644
index 000000000..13b2cf8da
--- /dev/null
+++ b/src/UnresolvableQueryDynamicFromException.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+namespace staabm\PHPStanDba;
+
+/**
+ * @api
+ */
+final class UnresolvableQueryDynamicFromException extends UnresolvableQueryException
+{
+    public static function getTip(): string
+    {
+        return 'Consider to simplify the FROM-clause construction.';
+    }
+}
diff --git a/src/UnresolvableQueryInvalidAfterSimulationException.php b/src/UnresolvableQueryInvalidAfterSimulationException.php
deleted file mode 100644
index 0a2125bd2..000000000
--- a/src/UnresolvableQueryInvalidAfterSimulationException.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace staabm\PHPStanDba;
-
-/**
- * @api
- */
-final class UnresolvableQueryInvalidAfterSimulationException extends UnresolvableQueryException
-{
-    public static function getTip(): string
-    {
-        return 'Consider to simplify the query string construction.';
-    }
-}
diff --git a/tests/rules/UnresolvableQueryMethodRuleTest.php b/tests/rules/UnresolvableQueryMethodRuleTest.php
index 8aedc6ad9..bf54b27ae 100644
--- a/tests/rules/UnresolvableQueryMethodRuleTest.php
+++ b/tests/rules/UnresolvableQueryMethodRuleTest.php
@@ -8,7 +8,7 @@
 use PHPStan\Testing\RuleTestCase;
 use staabm\PHPStanDba\QueryReflection\QueryReflection;
 use staabm\PHPStanDba\Rules\SyntaxErrorInQueryMethodRule;
-use staabm\PHPStanDba\UnresolvableQueryInvalidAfterSimulationException;
+use staabm\PHPStanDba\UnresolvableQueryDynamicFromException;
 use staabm\PHPStanDba\UnresolvableQueryMixedTypeException;
 use staabm\PHPStanDba\UnresolvableQueryStringTypeException;
 
@@ -76,7 +76,7 @@ public function testBug548(): void
             [
                 'Unresolvable Query: Seems the query is too dynamic to be resolved by query simulation.',
                 10,
-                UnresolvableQueryInvalidAfterSimulationException::getTip(),
+                UnresolvableQueryDynamicFromException::getTip(),
             ],
         ]);
     }
@@ -87,7 +87,7 @@ public function testBug547(): void
             [
                 'Unresolvable Query: Seems the query is too dynamic to be resolved by query simulation.',
                 10,
-                UnresolvableQueryInvalidAfterSimulationException::getTip(),
+                UnresolvableQueryDynamicFromException::getTip(),
             ],
         ]);
     }