diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarCluster.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarCluster.kt
index 8406c951af..4827300394 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarCluster.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarCluster.kt
@@ -33,8 +33,8 @@ private const val MAX_AVATAR_COUNT = 4
 @Composable
 internal fun AvatarCluster(
     avatars: ImmutableList<AvatarData>,
+    avatarType: AvatarType,
     modifier: Modifier = Modifier,
-    avatarType: AvatarType = AvatarType.User,
     hideAvatarImages: Boolean = false,
     contentDescription: String? = null,
 ) {
@@ -119,6 +119,7 @@ internal fun AvatarClusterPreview() = ElementThemedPreview {
         for (ngOfAvatars in 1..5) {
             AvatarCluster(
                 avatars = List(ngOfAvatars) { anAvatarData(it) }.toPersistentList(),
+                avatarType = AvatarType.User,
             )
         }
     }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/RoomAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/RoomAvatar.kt
index f01d71e41d..1b14a149d3 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/RoomAvatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/RoomAvatar.kt
@@ -49,6 +49,8 @@ internal fun RoomAvatar(
         else -> {
             AvatarCluster(
                 avatars = avatarType.heroes,
+                // Note: even for a room avatar, we use UserAvatarType here to display the avatar of heroes
+                avatarType = AvatarType.User,
                 modifier = modifier,
                 hideAvatarImages = hideAvatarImage,
                 contentDescription = contentDescription