diff --git a/js/models/conversations.js b/js/models/conversations.js
index 6b9e99ae00..c5c3a4cb9f 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -112,8 +112,9 @@
     },
 
     addSingleMessage(message) {
-      this.messageCollection.add(message, { merge: true });
+      const model = this.messageCollection.add(message, { merge: true });
       this.processQuotes(this.messageCollection);
+      return model;
     },
 
     onMessageError() {
@@ -685,7 +686,8 @@
           expireTimer: this.get('expireTimer'),
           recipients: this.getRecipients(),
         });
-        const message = this.messageCollection.add(messageWithSchema);
+        const message = this.addSingleMessage(messageWithSchema);
+
         if (this.isPrivate()) {
           message.set({ destination: this.id });
         }