diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarShape.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarShape.kt
index dff82a5a3d..8f80286abf 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarShape.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarShape.kt
@@ -13,11 +13,9 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Shape
 
 @Composable
-fun avatarShape(
-    avatarType: AvatarType,
-): Shape {
-    return when (avatarType) {
-        is AvatarType.Space -> RoundedCornerShape(avatarType.cornerSize)
+fun AvatarType.avatarShape(): Shape {
+    return when (this) {
+        is AvatarType.Space -> RoundedCornerShape(cornerSize)
         is AvatarType.Room,
         AvatarType.User -> CircleShape
     }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/ImageAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/ImageAvatar.kt
index 38f861b0e8..796ed6dfb4 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/ImageAvatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/ImageAvatar.kt
@@ -36,7 +36,7 @@ internal fun ImageAvatar(
         contentScale = ContentScale.Companion.Crop,
         modifier = modifier
                 .size(size)
-                .clip(avatarShape(avatarType))
+                .clip(avatarType.avatarShape())
     ) {
         val collectedState by painter.state.collectAsState()
         when (val state = collectedState) {
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/TextAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/TextAvatar.kt
index 0af6aa4841..38200ef8c6 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/TextAvatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/TextAvatar.kt
@@ -42,7 +42,7 @@ internal fun TextAvatar(
     Box(
         modifier
             .size(size)
-            .clip(avatarShape(avatarType))
+            .clip(avatarType.avatarShape())
             .background(color = colors.background)
     ) {
         val fontSize = size.toSp() / 2
diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt
index cf20763d7d..5a9ee72c75 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/components/UnsavedAvatar.kt
@@ -48,7 +48,7 @@ fun UnsavedAvatar(
 ) {
     val commonModifier = modifier
         .size(70.dp)
-        .clip(avatarShape(avatarType))
+        .clip(avatarType.avatarShape())
 
     if (avatarUri != null) {
         val context = LocalContext.current