diff --git a/app/src/main/java/com/nextcloud/talk/users/UserManager.kt b/app/src/main/java/com/nextcloud/talk/users/UserManager.kt
index ec4de2853..8df87671e 100644
--- a/app/src/main/java/com/nextcloud/talk/users/UserManager.kt
+++ b/app/src/main/java/com/nextcloud/talk/users/UserManager.kt
@@ -31,7 +31,7 @@ class UserManager internal constructor(private val userRepository: UsersReposito
     val currentUser: Maybe<User>
         get() {
             return userRepository.getActiveUser()
-                .switchIfEmpty(getAnyUserAndSetAsActive())
+                .switchIfEmpty(Maybe.defer { getAnyUserAndSetAsActive() })
         }
 
     val currentUserObservable: Observable<User>