diff --git a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
index decbfb8b23..a9eea1d27d 100644
--- a/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
+++ b/features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/RoomDetailsView.kt
@@ -122,10 +122,8 @@ fun RoomDetailsView(
                         roomId = state.roomId,
                         roomName = state.roomName,
                         roomAlias = state.roomAlias,
-                        openAvatarPreview = {
-                            if (state.roomAvatarUrl != null) {
-                                openAvatarPreview(state.roomName, state.roomAvatarUrl)
-                            }
+                        openAvatarPreview = { avatarUrl ->
+                            openAvatarPreview(state.roomName, avatarUrl)
                         },
                     )
                     MainActionsSection(
@@ -140,10 +138,8 @@ fun RoomDetailsView(
                         avatarUrl = state.roomAvatarUrl ?: member.avatarUrl,
                         userId = member.userId.value,
                         userName = state.roomName,
-                        openAvatarPreview = {
-                            if (member.avatarUrl != null) {
-                                openAvatarPreview(member.displayName ?: member.userId.value, member.avatarUrl!!)
-                            }
+                        openAvatarPreview = { avatarUrl ->
+                            openAvatarPreview(member.displayName ?: member.userId.value, avatarUrl)
                         },
                     )
                     RoomMemberMainActionsSection(onShareUser = ::onShareMember)