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 af6c3b488a..05f7ad21b9 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/JavaGenerator.java
@@ -620,10 +620,10 @@ public class JavaGenerator extends AbstractGenerator {
         if (generateEmbeddables() && database.getEmbeddables(schema).size() > 0)
             generateEmbeddables(schema);
 
-        if (generateEmbeddables() && generateInterfaces() && database.getTables(schema).size() > 0)
+        if (generateEmbeddables() && generateInterfaces() && database.getEmbeddables(schema).size() > 0)
             generateEmbeddableInterfaces(schema);
 
-        if (generateEmbeddables() && generatePojos() && database.getTables(schema).size() > 0)
+        if (generateEmbeddables() && generatePojos() && database.getEmbeddables(schema).size() > 0)
             generateEmbeddablePojos(schema);
 
         if (generatePojos() && database.getTables(schema).size() > 0)