diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
index c0bdcbb77e..6bfe37045f 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/RustMatrixClient.kt
@@ -158,10 +158,7 @@ class RustMatrixClient constructor(
             roomSummaryDataSource.awaitAllRoomsAreLoaded()
             cachedPairOfRoom = pairOfRoom(roomId)
         }
-        return@withContext if (cachedPairOfRoom == null) {
-            null
-        } else {
-            val (roomListItem, fullRoom) = cachedPairOfRoom
+        cachedPairOfRoom?.let { (roomListItem, fullRoom) ->
             RustMatrixRoom(
                 sessionId = sessionId,
                 roomListItem = roomListItem,