diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
index 185b7d35d6..c740e07257 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/room/summary/RoomSummaryUpdater.kt
@@ -114,12 +114,12 @@ internal class RoomSummaryUpdater @Inject constructor(
         roomSummaryEntity.notificationCount = unreadNotifications?.notificationCount ?: 0
 
         roomSummaryEntity.threadHighlightCount = unreadThreadNotifications
-                ?.mapNotNull { it.value.highlightCount }
-                ?.sum()
+                ?.map { it.value.highlightCount.takeIf { count -> (count ?: 0) > 0 } }
+                ?.size
                 ?: 0
         roomSummaryEntity.threadNotificationCount = unreadThreadNotifications
-                ?.mapNotNull { it.value.notificationCount }
-                ?.sum()
+                ?.map { it.value.notificationCount.takeIf { count -> (count ?: 0) > 0 } }
+                ?.size
                 ?: 0