diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
index 669fd31369..7c9ecced2d 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomSummaryRow.kt
@@ -204,8 +204,8 @@ private fun RowScope.NotificationIcons(room: RoomListRoomSummary) {
                     imageVector = CompoundIcons.Mention,
                     tint = ElementTheme.colors.unreadIndicator,
                 )
-            }
-            if (room.numUnreadMessages > 0) {
+                UnreadIndicatorAtom()
+            } else if (room.numUnreadMessages > 0) {
                 UnreadIndicatorAtom()
             }
         }
@@ -217,13 +217,9 @@ private fun RowScope.NotificationIcons(room: RoomListRoomSummary) {
                     imageVector = CompoundIcons.Mention,
                     tint = ElementTheme.colors.unreadIndicator,
                 )
-                if (room.numUnreadMessages > 0) {
-                    UnreadIndicatorAtom()
-                }
-            } else {
-                if (room.numUnreadMessages > 0) {
-                    UnreadIndicatorAtom(color = ElementTheme.colors.iconQuaternary)
-                }
+                UnreadIndicatorAtom()
+            } else if (room.numUnreadMessages > 0) {
+                UnreadIndicatorAtom(color = ElementTheme.colors.iconQuaternary)
             }
         }
         RoomNotificationMode.MUTE -> {
@@ -233,7 +229,7 @@ private fun RowScope.NotificationIcons(room: RoomListRoomSummary) {
                 imageVector = CompoundIcons.NotificationsSolidOff,
                 tint = ElementTheme.colors.iconQuaternary,
             )
-            if (room.numUnreadMessages > 0) {
+            if (room.numUnreadMessages > 0 || room.numUnreadMentions > 0) {
                 UnreadIndicatorAtom(color = ElementTheme.colors.iconQuaternary)
             }
         }
diff --git a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt
index 1aa21c6314..f530a2a3c3 100644
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/model/RoomListRoomSummaryProvider.kt
@@ -69,6 +69,14 @@ open class RoomListRoomSummaryProvider : PreviewParameterProvider<RoomListRoomSu
                             numUnreadMentions = 1,
                             hasOngoingCall = hasCall,
                         ),
+                        aRoomListRoomSummary(
+                            name = roomNotificationMode.name,
+                            lastMessage = "New mentions" + if (hasCall) ", call" else "",
+                            notificationMode = roomNotificationMode,
+                            numUnreadMessages = 0,
+                            numUnreadMentions = 1,
+                            hasOngoingCall = hasCall,
+                        ),
                     )
                 }.flatten()
             }.flatten(),