diff --git a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
index cd8670a48d..ac983a9f0c 100644
--- a/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
+++ b/vector/src/main/java/im/vector/app/features/home/UnreadMessagesSharedViewModel.kt
@@ -177,13 +177,11 @@ class UnreadMessagesSharedViewModel @AssistedInject constructor(@Assisted initia
                             CountInfo(
                                     homeCount = counts,
                                     otherCount = RoomAggregateNotificationCount(
-                                            rootCounts.fold(0, { acc, rs ->
-                                                acc + rs.notificationCount
-                                            }) + (counts.notificationCount.takeIf { selectedSpace != null } ?: 0)
+                                            notificationCount = rootCounts.fold(0, { acc, rs -> acc + rs.notificationCount })
+                                                    + (counts.notificationCount.takeIf { selectedSpace != null } ?: 0)
                                                     + spaceInviteCount,
-                                            rootCounts.fold(0, { acc, rs ->
-                                                acc + rs.highlightCount
-                                            }) + (counts.highlightCount.takeIf { selectedSpace != null } ?: 0)
+                                            highlightCount = rootCounts.fold(0, { acc, rs -> acc + rs.highlightCount })
+                                                    + (counts.highlightCount.takeIf { selectedSpace != null } ?: 0)
                                                     + spaceInviteCount
                                     )
                             )