diff --git a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt
index 2dbbe70f32..dfbaaeb2df 100644
--- a/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/libraries/matrix/ui/room/MatrixRoomMembers.kt
@@ -61,11 +61,5 @@ fun MatrixRoom.getDirectRoomMember(roomMembersState: MatrixRoomMembersState): St
 
 @Composable
 fun MatrixRoom.getCurrentRoomMember(roomMembersState: MatrixRoomMembersState): State<RoomMember?> {
-    val roomMembers = roomMembersState.roomMembers()
-    return remember(roomMembersState) {
-        derivedStateOf {
-            roomMembers
-                ?.find { it.userId == sessionId }
-        }
-    }
+    return getRoomMemberAsState(roomMembersState = roomMembersState, userId = sessionId)
 }