diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarType.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarType.kt
index 9e030a4349..720a0b0e6a 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarType.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/AvatarType.kt
@@ -23,5 +23,6 @@ sealed interface AvatarType {
 
     data class Space(
         val cornerSize: Dp,
+        val isTombstoned: Boolean = false,
     ) : AvatarType
 }
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/SpaceAvatar.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/SpaceAvatar.kt
index 76f57d159e..65906244e6 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/SpaceAvatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/avatar/SpaceAvatar.kt
@@ -23,12 +23,11 @@ fun SpaceAvatar(
     avatarData: AvatarData,
     avatarType: AvatarType.Space,
     modifier: Modifier = Modifier,
-    isTombstoned: Boolean = false,
     hideAvatarImage: Boolean = false,
     contentDescription: String? = null,
 ) {
     when {
-        isTombstoned -> TombstonedRoomAvatar(
+        avatarType.isTombstoned -> TombstonedRoomAvatar(
             size = avatarData.size,
             avatarType = avatarType,
             modifier = modifier,
@@ -67,8 +66,10 @@ internal fun SpaceAvatarPreview() =
             )
             SpaceAvatar(
                 avatarData = anAvatarData(),
-                avatarType = AvatarType.Space(cornerSize = 16.dp),
-                isTombstoned = true,
+                avatarType = AvatarType.Space(
+                    cornerSize = 16.dp,
+                    isTombstoned = true,
+                ),
             )
         }
     }