diff --git a/jOOQ-test/src/test/java/org/jooq/test/all/testcases/OrderByTests.java b/jOOQ-test/src/test/java/org/jooq/test/all/testcases/OrderByTests.java
index 6fdb35f68a..1705dcae00 100644
--- a/jOOQ-test/src/test/java/org/jooq/test/all/testcases/OrderByTests.java
+++ b/jOOQ-test/src/test/java/org/jooq/test/all/testcases/OrderByTests.java
@@ -700,5 +700,14 @@ extends BaseTest<A, AP, B, S, B2S, BS, L, X, DATE, BOOL, D, T, U, UU, I, IPK, T7
                 .fetch();
 
         assertEquals(2, result.size());
+
+        result =
+        create().select(TBook_CONTENT_TEXT())
+                .from(TBook())
+                .limit(2)
+                .offset(1)
+                .fetch();
+
+        assertEquals(2, result.size());
     }
 }
diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index d9a0c9abbf..a0d608084c 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -1098,10 +1098,11 @@ class SelectQueryImpl<R extends Record> extends AbstractSelect<R> implements Sel
         return seek;
     }
 
+    @Deprecated // Can this be written any better?
     final SortFieldList getNonEmptyOrderBy() {
         if (getOrderBy().isEmpty()) {
             SortFieldList result = new SortFieldList();
-            result.add(getSelect().get(0).asc());
+            result.add(DSL.field("@@version").asc());
             return result;
         }