diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
index 37673a0b77..e7ec535f76 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
@@ -1599,7 +1599,7 @@ abstract class AbstractResultQuery<R extends Record> extends AbstractQuery imple
     private final boolean hasLimit1() {
         if (this instanceof SelectQueryImpl) {
             Limit l = ((SelectQueryImpl) this).getLimit();
-            return !l.withTies() && l.limitOne();
+            return !l.withTies() && !l.percent() && l.limitOne();
         }
 
         return false;
diff --git a/jOOQ/src/main/java/org/jooq/impl/Limit.java b/jOOQ/src/main/java/org/jooq/impl/Limit.java
index 9a5964ebb1..a6a2a1d4cd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/Limit.java
+++ b/jOOQ/src/main/java/org/jooq/impl/Limit.java
@@ -385,7 +385,7 @@ final class Limit extends AbstractQueryPart {
     final boolean limitOne() {
         return !limitZero()
             && !withTies()
-
+            && !percent()
             && numberOfRows instanceof Param
             && Long.valueOf(1L).equals(((Param<?>) numberOfRows).getValue());
     }