diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index 02caafa586..9f39526644 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -907,7 +907,9 @@ final class DefaultParseContext extends AbstractScope implements ParseContext {
             }
             while (parseDelimiterIf(true) && (p = positionBeforeWhitespace) >= 0 && !done());
 
-            retainComments(result, p);
+            if (query != null)
+                retainComments(result, p);
+
             return done("Unexpected token or missing query delimiter", dsl.queries(result));
         });
     }