diff --git a/NotificationExtension/NotificationService.swift b/NotificationExtension/NotificationService.swift
index 6270a335..83a59808 100644
--- a/NotificationExtension/NotificationService.swift
+++ b/NotificationExtension/NotificationService.swift
@@ -175,6 +175,7 @@ class NotificationService: UNNotificationServiceExtension {
         } else {
             conversationIdentifier = nil
         }
+        content.threadIdentifier = conversationIdentifier ?? ""
         
         let account: Account?
         switch notification.kind {
@@ -212,7 +213,7 @@ class NotificationService: UNNotificationServiceExtension {
             outgoingMessageType: .outgoingMessageText,
             content: notificationContent,
             speakableGroupName: nil,
-            conversationIdentifier: conversationIdentifier,
+            conversationIdentifier: nil,
             serviceName: nil,
             sender: sender,
             attachments: nil