diff --git a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt
index 8ce4a58e43..c0a43784f7 100644
--- a/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt
+++ b/features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt
@@ -71,14 +71,11 @@ class ConfigureRoomPresenter @Inject constructor(
 
         val avatarActions by remember(createRoomConfig.value.avatarUri) {
             derivedStateOf {
-                mutableListOf(
+                listOfNotNull(
                     AvatarAction.TakePhoto,
                     AvatarAction.ChoosePhoto,
-                ).apply {
-                    if (createRoomConfig.value.avatarUri != null) {
-                        add(AvatarAction.Remove)
-                    }
-                }.toImmutableList()
+                    AvatarAction.Remove.takeIf { createRoomConfig.value.avatarUri != null },
+                ).toImmutableList()
             }
         }