diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index 1392ceedba4..5e56cafb67d 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -4162,6 +4162,7 @@ export class ConversationModel extends window.Backbone
       if (!dontAddMessage) {
         this.doAddSingleMessage(message, { isJustSent: true });
       }
+      const notificationData = message.getNotificationData();
       const draftProperties = dontClearDraft
         ? {}
         : {
@@ -4172,7 +4173,8 @@ export class ConversationModel extends window.Backbone
             quotedMessageId: undefined,
             lastMessageAuthor: message.getAuthorText(),
             lastMessageBodyRanges: message.get('bodyRanges'),
-            lastMessage: message.getNotificationText(),
+            lastMessage:
+              notificationData?.text || message.getNotificationText() || '',
             lastMessageStatus: 'sending' as const,
           };