diff --git a/app/builders/messages/facebook/message_builder.rb b/app/builders/messages/facebook/message_builder.rb
index bfca31870..cf6d35a6f 100644
--- a/app/builders/messages/facebook/message_builder.rb
+++ b/app/builders/messages/facebook/message_builder.rb
@@ -61,11 +61,8 @@ class Messages::Facebook::MessageBuilder < Messages::Messenger::MessageBuilder
       else
         # If lock to single conversation is disabled, we will create a new conversation if previous conversation is resolved
         last_conversation = Conversation.where(conversation_params).order(created_at: :desc).first
-        if last_conversation&.status == 'resolved'
-          build_conversation
-        else
-          last_conversation
-        end
+
+        last_conversation&.status == 'resolved' ? build_conversation : last_conversation || build_conversation
       end
     end
   end
diff --git a/app/builders/messages/instagram/message_builder.rb b/app/builders/messages/instagram/message_builder.rb
index 770633150..f6add092b 100644
--- a/app/builders/messages/instagram/message_builder.rb
+++ b/app/builders/messages/instagram/message_builder.rb
@@ -77,7 +77,9 @@ class Messages::Instagram::MessageBuilder < Messages::Messenger::MessageBuilder
       if lock_to_single_conversation
         conversations.find_by || build_conversation
       else
+        # If lock to single conversation is disabled, we will create a new conversation if previous conversation is resolved
         last_conversation = conversations.order(created_at: :desc).first
+
         last_conversation&.status == 'resolved' ? build_conversation : last_conversation || build_conversation
       end
     end