diff --git a/db/migrate/20200225114743_add_created_at_to_bet.rb b/db/migrate/20200225114743_add_created_at_to_bet.rb
index 1b9da648..204169ca 100644
--- a/db/migrate/20200225114743_add_created_at_to_bet.rb
+++ b/db/migrate/20200225114743_add_created_at_to_bet.rb
@@ -2,7 +2,7 @@ class AddCreatedAtToBet < ActiveRecord::Migration[6.0]
   def change
     add_column :bets, :created_at, :datetime
     Bet.reset_column_information
-    Bet.all.each do |b|
+    Bet.all.find_each do |b|
       b.update!(created_at: b.set_created_at)
     end
   end
diff --git a/db/migrate/20200228171904_add_permanent_to_bet.rb b/db/migrate/20200228171904_add_permanent_to_bet.rb
index 2ee49136..9c18e3b6 100644
--- a/db/migrate/20200228171904_add_permanent_to_bet.rb
+++ b/db/migrate/20200228171904_add_permanent_to_bet.rb
@@ -2,7 +2,7 @@ class AddPermanentToBet < ActiveRecord::Migration[6.0]
   def change
     add_column :bets, :permanent, :bool, default: false
     Bet.reset_column_information
-    Bet.all.each do |b|
+    Bet.all.find_each do |b|
       b.update!(permanent: true)
     end
   end
diff --git a/features/step_definitions/best_bet_steps.rb b/features/step_definitions/best_bet_steps.rb
index 3d2bdf31..92b6e066 100644
--- a/features/step_definitions/best_bet_steps.rb
+++ b/features/step_definitions/best_bet_steps.rb
@@ -104,7 +104,7 @@
 When(/^I delete all the best bets$/) do
   @query_es_ids = []
 
-  Query.all.each do |query|
+  Query.all.find_each do |query|
     @query_es_ids << "#{query.query}-#{query.match_type}"
 
     query.bets.each do |bet|
diff --git a/lib/tasks/publish_external_links.rake b/lib/tasks/publish_external_links.rake
index ea09cc96..95f46846 100644
--- a/lib/tasks/publish_external_links.rake
+++ b/lib/tasks/publish_external_links.rake
@@ -2,7 +2,7 @@ desc "Ensure all external links in the database are present in the publishing pl
 namespace :publish_external_links do
   desc "Send external links to the Publishing API"
   task publishing_api: :environment do
-    RecommendedLink.all.each do |link|
+    RecommendedLink.all.find_each do |link|
       puts link.link
       ExternalContentPublisher.publish(link)
     end
diff --git a/lib/tasks/reindex_best_bets.rake b/lib/tasks/reindex_best_bets.rake
index 03c9616c..d0f932e9 100644
--- a/lib/tasks/reindex_best_bets.rake
+++ b/lib/tasks/reindex_best_bets.rake
@@ -14,7 +14,7 @@ task reindex_best_bets: :environment do
   puts "Starting to reindex #{Query.count} best bets in search_api"
   start = Time.zone.now.to_f
 
-  Query.all.each do |query|
+  Query.all.find_each do |query|
     puts "Processing: #{query.query} (#{query.match_type})"
     SearchApiSaver.new(query).save # rubocop:disable Rails/SaveBang
   end