diff --git a/jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java b/jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java
index 55c59bc966..23f5d6d789 100644
--- a/jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java
+++ b/jOOQ/src/main/java/org/jooq/impl/CombinedCondition.java
@@ -43,7 +43,6 @@ import static org.jooq.Clause.CONDITION_AND;
 import static org.jooq.Clause.CONDITION_OR;
 import static org.jooq.Operator.AND;
 import static org.jooq.impl.DSL.falseCondition;
-import static org.jooq.impl.DSL.noCondition;
 import static org.jooq.impl.DSL.trueCondition;
 import static org.jooq.impl.Keywords.K_AND;
 import static org.jooq.impl.Keywords.K_OR;
@@ -80,9 +79,6 @@ final class CombinedCondition extends AbstractCondition {
     }
 
     static Condition of(Operator operator, Collection<? extends Condition> conditions) {
-        if (conditions.isEmpty())
-            return noCondition();
-
         CombinedCondition result = null;
         Condition first = null;
 
@@ -101,8 +97,10 @@ final class CombinedCondition extends AbstractCondition {
             return result;
         else if (first != null)
             return first;
+        else if (operator == AND)
+            return trueCondition();
         else
-            return noCondition();
+            return falseCondition();
     }
 
     private CombinedCondition(Operator operator, int size) {