diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
index 1c65b491ca..c3cf7c4d45 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
@@ -2308,6 +2308,10 @@ public class JavaGenerator extends AbstractGenerator {
             if (baseType.equals(getStrategy().getFullJavaClassName(udt, Mode.RECORD)))
                 return true;
 
+        for (TableDefinition table : t.getDatabase().getTables())
+            if (baseType.equals(getStrategy().getFullJavaClassName(table, Mode.RECORD)))
+                return true;
+
         return false;
     }