1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/each_batch.rb b/app/models/concerns/each_batch.rb
index 945d286a2fd..0c8cf861c38 100644
--- a/app/models/concerns/each_batch.rb
+++ b/app/models/concerns/each_batch.rb
@@ -54,7 +54,7 @@ module EachBatch
           'the column: argument must be set to a column name to use for ordering rows'
       end
 
-      start = except(:select)
+      start = except(:select, :includes, :preload)
         .select(column)
         .reorder(column => order)
 
@@ -69,7 +69,7 @@ module EachBatch
       1.step do |index|
         start_cond = arel_table[column].gteq(start_id)
         start_cond = arel_table[column].lteq(start_id) if order == :desc
-        stop = except(:select)
+        stop = except(:select, :includes, :preload)
           .select(column)
           .where(start_cond)
           .reorder(column => order)