diff --git a/ElementX/Sources/Services/Notification/Proxy/NotificationItemProxy.swift b/ElementX/Sources/Services/Notification/Proxy/NotificationItemProxy.swift
index c438bba57..6c3b714e4 100644
--- a/ElementX/Sources/Services/Notification/Proxy/NotificationItemProxy.swift
+++ b/ElementX/Sources/Services/Notification/Proxy/NotificationItemProxy.swift
@@ -179,7 +179,8 @@ extension NotificationItemProxyProtocol {
         notification.eventID = eventID
         notification.sound = isNoisy ? UNNotificationSound(named: UNNotificationSoundName(rawValue: "message.caf")) : nil
         // So that the UI groups notification that are received for the same room but also for the same user
-        notification.threadIdentifier = "\(receiverID)\(roomID)"
+        // Removing the @ fixes an iOS bug where the notification crashes if the mute button is tapped
+        notification.threadIdentifier = "\(receiverID)\(roomID)".replacingOccurrences(of: "@", with: "")
         return notification
     }
 
diff --git a/changelog.d/1519.bugfix b/changelog.d/1519.bugfix
new file mode 100644
index 000000000..2cfce146b
--- /dev/null
+++ b/changelog.d/1519.bugfix
@@ -0,0 +1 @@
+Fixed a bug that made the spring board crash when trying to mute notifications.
\ No newline at end of file