diff --git a/jOOQ/src/main/java/org/jooq/impl/Limit.java b/jOOQ/src/main/java/org/jooq/impl/Limit.java
index 246da46373..897ccaba8b 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Limit.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Limit.java
@@ -447,7 +447,7 @@ final class Limit extends AbstractQueryPart implements UTransient {
 
     final void setOffset(Field<? extends Number> offset) {
         this.offset = offset;
-        this.offsetOrZero = offset;
+        this.offsetOrZero = offset == null ? ZERO : offset;
     }
 
     final void setLimit(Number l) {
@@ -457,7 +457,7 @@ final class Limit extends AbstractQueryPart implements UTransient {
 
     final void setLimit(Field<? extends Number> l) {
         this.limit = l;
-        this.limitOrMax = l;
+        this.limitOrMax = l == null ? MAX : l;
     }
 
     final Long getLimit() {
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index 8783b2b7be..865054397e 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -4729,6 +4729,20 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+