diff --git a/IceCubesNotifications/NotificationService.swift b/IceCubesNotifications/NotificationService.swift
index ac1100e6..3ff45526 100644
--- a/IceCubesNotifications/NotificationService.swift
+++ b/IceCubesNotifications/NotificationService.swift
@@ -88,6 +88,7 @@ class NotificationService: UNNotificationServiceExtension {
                                                 currentUser: bestAttemptContent.userInfo["i"] as? String ?? "",
                                                 avatarURL: fileURL)
                 bestAttemptContent = try bestAttemptContent.updating(from: intent) as! UNMutableNotificationContent
+                bestAttemptContent.threadIdentifier = remoteNotification.status?.id ?? remoteNotification.account.id
                 if type == .mention {
                   bestAttemptContent.body = notification.body.escape()
                 } else {