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 4827300394..d2dae9e25c 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
@@ -49,12 +49,13 @@ internal fun AvatarCluster(
             error("Unsupported number of avatars: 0")
         }
         1 -> {
-            Avatar(
+            InitialOrImageAvatar(
                 avatarData = limitedAvatars[0],
-                avatarType = avatarType,
+                hideAvatarImage = hideAvatarImages,
+                avatarShape = avatarType.avatarShape(),
+                forcedAvatarSize = null,
                 modifier = modifier,
                 contentDescription = contentDescription,
-                hideImage = hideAvatarImages
             )
         }
         else -> {