diff --git a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
index 355e047972..7d56586bfd 100644
--- a/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
+++ b/jOOQ/src/main/java/org/jooq/impl/AbstractResultQuery.java
@@ -214,14 +214,14 @@ abstract class AbstractResultQuery<R extends Record> extends AbstractQuery imple
 
     @Override
     public final R fetchAny() throws SQLException {
-        // TODO: restrict ROWNUM = 1
-        Result<R> r = fetch();
+        Cursor<R> c = fetchLazy();
 
-        if (r.size() > 0) {
-            return r.get(0);
+        try {
+            return c.fetchOne();
+        }
+        finally {
+            c.close();
         }
-
-        return null;
     }
 
     @Override