diff --git a/app/services/integrations/facebook/message_creator.rb b/app/services/integrations/facebook/message_creator.rb
index cf28743f9..b67c162fc 100644
--- a/app/services/integrations/facebook/message_creator.rb
+++ b/app/services/integrations/facebook/message_creator.rb
@@ -29,14 +29,14 @@ class Integrations::Facebook::MessageCreator
   end
 
   def create_agent_message
-    Channel::FacebookPage.where(page_id: response.sender_id).each do |page|
+    Channel::FacebookPage.where(page_id: response.sender_id).find_each do |page|
       mb = Messages::Facebook::MessageBuilder.new(response, page.inbox, outgoing_echo: true)
       mb.perform
     end
   end
 
   def create_contact_message
-    Channel::FacebookPage.where(page_id: response.recipient_id).each do |page|
+    Channel::FacebookPage.where(page_id: response.recipient_id).find_each do |page|
       mb = Messages::Facebook::MessageBuilder.new(response, page.inbox)
       mb.perform
     end