diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
index f72abab5df..9dc171bfab 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/GenerationTool.java
@@ -524,7 +524,7 @@ public class GenerationTool {
                 generator.setGenerateRelations(g.getGenerate().isRelations());
             if (g.getGenerate().isDeprecated() != null)
                 generator.setGenerateDeprecated(g.getGenerate().isDeprecated());
-            if (g.getGenerate().isDeprecationOnUnknownTypes())
+            if (g.getGenerate().isDeprecationOnUnknownTypes() != null)
                 generator.setGenerateDeprecationOnUnknownTypes(g.getGenerate().isDeprecationOnUnknownTypes());
             if (g.getGenerate().isInstanceFields() != null)
                 generator.setGenerateInstanceFields(g.getGenerate().isInstanceFields());
diff --git a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
index c5aba8375b..7da9575a52 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/util/JavaGenerator.java
@@ -4575,7 +4575,7 @@ public class JavaGenerator extends AbstractGenerator {
     }
 
     private boolean printDeprecationIfUnknownType(JavaWriter out, String type, int indentation) {
-        if ("java.lang.Object".equals(type)) {
+        if (generateDeprecationOnUnknownTypes() && "java.lang.Object".equals(type)) {
             out.tab(indentation).javadoc("@deprecated Unknown data type. "
                 + "Please define an explicit {@link org.jooq.Binding} to specify how this "
                 + "type should be handled.");