diff --git a/js/models/conversations.js b/js/models/conversations.js
index 510ab6cb4c6..c23a98797ee 100644
--- a/js/models/conversations.js
+++ b/js/models/conversations.js
@@ -782,11 +782,12 @@
         });
 
         const message = this.addSingleMessage(messageWithSchema);
+        this.lastMessage = message.getNotificationText();
+        this.lastMessageStatus = 'sending';
+
         this.save({
           active_at: now,
           timestamp: now,
-          lastMessage: message.getNotificationText(),
-          lastMessageStatus: 'sending',
         });
 
         if (this.isPrivate()) {
diff --git a/js/models/messages.js b/js/models/messages.js
index 70698ef6966..1f385af86e9 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -1205,8 +1205,8 @@
             !conversationTimestamp ||
             message.get('sent_at') > conversationTimestamp
           ) {
+            conversation.lastMessage = message.getNotificationText();
             conversation.set({
-              lastMessage: message.getNotificationText(),
               timestamp: message.get('sent_at'),
             });
           }