diff --git a/js/models/conversations.js b/js/models/conversations.js
index d77fa9807..9929755c7 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -250,7 +250,7 @@
       // Friend request message conmfirmations (Accept / Decline) are always
       // sent to the primary device conversation
       const messages = await window.Signal.Data.getMessagesByConversation(
-        this.id,
+        this.getPrimaryDevicePubKey(),
         {
           limit: 1,
           MessageCollection: Whisper.MessageCollection,
diff --git a/js/models/messages.js b/js/models/messages.js
index d3928ec3c..85d3d6437 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -2508,7 +2508,7 @@
           }
 
           const sendingDeviceConversation = await ConversationController.getOrCreateAndWait(
-            source,
+            primarySource,
             'private'
           );
           if (dataMessage.profileKey) {