diff --git a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/SessionManager.kt b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/SessionManager.kt
index 0a87a7ce..21f16d3d 100644
--- a/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/SessionManager.kt
+++ b/matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/SessionManager.kt
@@ -50,16 +50,10 @@ internal class SessionManager @Inject constructor(private val matrixComponent: M
     }
 
     private fun getOrCreateSessionComponent(sessionParams: SessionParams): SessionComponent {
-        val userId = sessionParams.credentials.userId
-        if (sessionComponents.containsKey(userId)) {
-            return sessionComponents[userId]!!
+        return sessionComponents.getOrPut(sessionParams.credentials.userId) {
+            DaggerSessionComponent
+                    .factory()
+                    .create(matrixComponent, sessionParams)
         }
-        return DaggerSessionComponent
-                .factory()
-                .create(matrixComponent, sessionParams)
-                .also {
-                    sessionComponents[userId] = it
-                }
     }
-
 }
\ No newline at end of file