diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index 1b0fc5b92..b0ae97044 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -4475,7 +4475,8 @@ export class ConversationModel extends window.Backbone
     const notificationData = previewMessage?.getNotificationData();
 
     this.set({
-      lastMessage: notificationData?.text || '',
+      lastMessage:
+        notificationData?.text || previewMessage?.getNotificationText() || '',
       lastMessageBodyRanges: notificationData?.bodyRanges,
       lastMessagePrefix: notificationData?.emoji,
       lastMessageAuthor: previewMessage?.getAuthorText(),