diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/CompositeAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/CompositeAvatar.kt
index 2422f32c92..6ae505e048 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/CompositeAvatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/CompositeAvatar.kt
@@ -122,30 +122,12 @@ internal fun CompositeAvatarPreview() = ElementThemedPreview {
     Row(
         horizontalArrangement = Arrangement.spacedBy(8.dp)
     ) {
-        CompositeAvatar(
-            avatarData = mainAvatar,
-            heroes = List(0) { aHeroAvatarData(it) }.toPersistentList(),
-        )
-        CompositeAvatar(
-            avatarData = mainAvatar,
-            heroes = List(1) { aHeroAvatarData(it) }.toPersistentList(),
-        )
-        CompositeAvatar(
-            avatarData = mainAvatar,
-            heroes = List(2) { aHeroAvatarData(it) }.toPersistentList(),
-        )
-        CompositeAvatar(
-            avatarData = mainAvatar,
-            heroes = List(3) { aHeroAvatarData(it) }.toPersistentList(),
-        )
-        CompositeAvatar(
-            avatarData = mainAvatar,
-            heroes = List(4) { aHeroAvatarData(it) }.toPersistentList(),
-        )
-        CompositeAvatar(
-            avatarData = mainAvatar,
-            heroes = List(5) { aHeroAvatarData(it) }.toPersistentList(),
-        )
+        repeat(6) { nbOfHeroes ->
+            CompositeAvatar(
+                avatarData = mainAvatar,
+                heroes = List(nbOfHeroes) { aHeroAvatarData(it) }.toPersistentList(),
+            )
+        }
     }
 }