diff --git a/src/main/java/io/ebeaninternal/server/query/CQuery.java b/src/main/java/io/ebeaninternal/server/query/CQuery.java
index 9e8548702..0a62a2aa2 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQuery.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQuery.java
@@ -608,7 +608,7 @@ public class CQuery<T> implements DbReadContext, CancelableQuery, SpiProfileTran
   }
 
   QueryIterator<T> readIterate(int bufferSize, OrmQueryRequest<T> request) {
-    if (bufferSize < 2) {
+    if (bufferSize == 1) {
       return new CQueryIteratorSimple<>(this, request);
     } else {
       return new CQueryIteratorWithBuffer<>(this, request, bufferSize);
diff --git a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
index b081254ed..22e4d7431 100644
--- a/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
+++ b/src/main/java/io/ebeaninternal/server/query/CQueryEngine.java
@@ -228,6 +228,8 @@ public class CQueryEngine {
         int queryBatch = request.getQuery().getLazyLoadBatchSize();
         if (queryBatch > 0) {
           iterateBufferSize = queryBatch;
+        } else {
+          iterateBufferSize = 100;
         }
       }
 
diff --git a/src/test/java/org/tests/query/TestQueryFindIterate.java b/src/test/java/org/tests/query/TestQueryFindIterate.java
index 760e17969..8416b2f54 100644
--- a/src/test/java/org/tests/query/TestQueryFindIterate.java
+++ b/src/test/java/org/tests/query/TestQueryFindIterate.java
@@ -246,7 +246,7 @@ public class TestQueryFindIterate extends BaseTestCase {
       .order().asc("id");
 
     if (withLoadBatch) {
-      query.setLazyLoadBatchSize(100);
+      query.setLazyLoadBatchSize(1);
     }
 
     QueryIterator<Customer> queryIterator = query.findIterate();