diff --git a/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java b/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java
index 39ac8dff2b..70f015350b 100644
--- a/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java
+++ b/jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java
@@ -1028,7 +1028,7 @@ public class GenerationTool {
     ) {
         String p = System.getProperty(property);
 
-        if (override ? p != null : checkDefault.test(get.apply(configurationObject)))
+        if (p != null && (override || checkDefault.test(get.apply(configurationObject))))
             set.accept(configurationObject, convert.apply(p));
     }