diff --git a/app/services/app_store/review_builder.rb b/app/services/app_store/review_builder.rb
index f2e2cc143..82c656fd3 100644
--- a/app/services/app_store/review_builder.rb
+++ b/app/services/app_store/review_builder.rb
@@ -7,8 +7,10 @@ class AppStore::ReviewBuilder
     ActiveRecord::Base.transaction do
       build_contact_inbox
       build_conversation
-      upsert_review_message
-      build_response_message if response_body.present?
+      @conversation.with_lock do
+        upsert_review_message
+        build_response_message if response_body.present?
+      end
     end
   end