diff --git a/server/modules/filter/maxrows/maxrows.c b/server/modules/filter/maxrows/maxrows.c
index c4ac347bb..633cf5088 100644
--- a/server/modules/filter/maxrows/maxrows.c
+++ b/server/modules/filter/maxrows/maxrows.c
@@ -998,7 +998,7 @@ static int handle_rows(MAXROWS_SESSION_DATA *csdata, GWBUF* buffer, size_t extra
         }
     }
 
-    csdata->res.offset += offset;
+    csdata->res.offset += offset - extra_offset;
 
     return rv;
 }