diff --git a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
index f16694468a..22969a7869 100644
--- a/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/SelectQueryImpl.java
@@ -1608,9 +1608,6 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
 
 
 
-
-
-
 
 
 
@@ -1844,6 +1841,7 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
         // [#2791] [#9981] TODO: We have an automatic way of pushing / popping
         //                 these values onto the scope stack. Use that, instead
         Object renderTrailingLimit = context.data(DATA_RENDER_TRAILING_LIMIT_IF_APPLICABLE);
+        Object transformRownumToLimit = context.data(DATA_TRANSFORM_ROWNUM_TO_LIMIT);
         Name[] selectAliases = (Name[]) context.data(DATA_SELECT_ALIASES);
 
 
@@ -1877,6 +1875,8 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
 
             if (TRUE.equals(renderTrailingLimit))
                 context.data().remove(DATA_RENDER_TRAILING_LIMIT_IF_APPLICABLE);
+            if (TRUE.equals(transformRownumToLimit))
+                context.data().remove(DATA_TRANSFORM_ROWNUM_TO_LIMIT);
 
             if (intoTable != null
                     && !TRUE.equals(context.data(DATA_OMIT_INTO_CLAUSE))
@@ -2150,6 +2150,8 @@ final class SelectQueryImpl<R extends Record> extends AbstractResultQuery<R> imp
 
         }
         finally {
+            if (transformRownumToLimit != null)
+                context.data(DATA_TRANSFORM_ROWNUM_TO_LIMIT, transformRownumToLimit);
             if (renderTrailingLimit != null)
                 context.data(DATA_RENDER_TRAILING_LIMIT_IF_APPLICABLE, renderTrailingLimit);
             if (selectAliases != null)