diff --git a/app/services/csv/lettings_log_csv_service.rb b/app/services/csv/lettings_log_csv_service.rb
index 889cbf263..ceb27acbe 100644
--- a/app/services/csv/lettings_log_csv_service.rb
+++ b/app/services/csv/lettings_log_csv_service.rb
@@ -10,7 +10,7 @@ module Csv
       CSV.generate(headers: true) do |csv|
         csv << @attributes
 
-        logs.each do |log|
+        logs.find_each do |log|
           csv << @attributes.map { |attribute| value(attribute, log) }
         end
       end
diff --git a/app/services/csv/sales_log_csv_service.rb b/app/services/csv/sales_log_csv_service.rb
index 89aa490ca..900d3fdb1 100644
--- a/app/services/csv/sales_log_csv_service.rb
+++ b/app/services/csv/sales_log_csv_service.rb
@@ -9,7 +9,7 @@ module Csv
       CSV.generate(headers: true) do |csv|
         csv << @attributes
 
-        logs.each do |log|
+        logs.find_each do |log|
           csv << @attributes.map { |attribute| value(attribute, log) }
         end
       end
diff --git a/app/services/csv/scheme_csv_service.rb b/app/services/csv/scheme_csv_service.rb
index e14d0e029..e8bb5e3ad 100644
--- a/app/services/csv/scheme_csv_service.rb
+++ b/app/services/csv/scheme_csv_service.rb
@@ -13,18 +13,18 @@ module Csv
 
         case @download_type
         when "schemes"
-          schemes.each do |scheme|
+          schemes.find_each do |scheme|
             csv << scheme_attributes.map { |attribute| scheme_value(attribute, scheme) }
           end
         when "locations"
-          schemes.each do |scheme|
-            scheme.locations.each do |location|
+          schemes.find_each do |scheme|
+            scheme.locations.find_each do |location|
               csv << [scheme.id_to_display] + location_attributes.map { |attribute| location_value(attribute, location) }
             end
           end
         when "combined"
-          schemes.each do |scheme|
-            scheme.locations.each do |location|
+          schemes.find_each do |scheme|
+            scheme.locations.find_each do |location|
               csv << scheme_attributes.map { |attribute| scheme_value(attribute, scheme) } + location_attributes.map { |attribute| location_value(attribute, location) }
             end
           end