diff --git a/NSE/Sources/NotificationHandler.swift b/NSE/Sources/NotificationHandler.swift
index 3aca9c2d5..08ae5e05b 100644
--- a/NSE/Sources/NotificationHandler.swift
+++ b/NSE/Sources/NotificationHandler.swift
@@ -43,7 +43,9 @@ class NotificationHandler {
         MXLog.info("\(tag) Processing event: \(eventID) in room: \(roomID)")
         
         // Copy over the unread information to the notification badge
-        notificationContent.badge = NSNumber(value: notificationContent.unreadCount)
+        if let unreadCount = notificationContent.unreadCount {
+            notificationContent.badge = NSNumber(value: unreadCount)
+        }
         
         guard let notificationItemProxy = await userSession.notificationItemProxy(roomID: roomID, eventID: eventID) else {
             MXLog.error("\(tag) Failed retrieving notification item")