diff --git a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
index 6ff9903594..b6e96ed2fc 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AlterTableImpl.java
@@ -450,7 +450,7 @@ final class AlterTableImpl extends AbstractQuery implements
         SQLDialect family = ctx.family();
 
         boolean omitAlterTable = family == HSQLDB && renameConstraint != null;
-        boolean renameTable = asList().contains(family);
+        boolean renameTable = asList().contains(family) && renameTo != null;
 
         if (!omitAlterTable) {
             ctx.start(ALTER_TABLE_TABLE)