diff --git a/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.kt b/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.kt
index 238cdad52..0e7c8af5b 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/ssl/MagicKeyManager.kt
@@ -44,10 +44,11 @@ class MagicKeyManager(private val keyManager: X509KeyManager, private val usersR
         user?.let {
             it.clientCertificate?.let {
                 alias = it
-            } ?: run {
-                appPreferences.temporaryClientCertAlias?.let {
-                    alias = it
-                }
+            }
+        }
+        if (alias == null) {
+            appPreferences.temporaryClientCertAlias?.let {
+                alias = it
             }
         }
 
@@ -163,4 +164,4 @@ class MagicKeyManager(private val keyManager: X509KeyManager, private val usersR
         private const val TAG = "MagicKeyManager"
     }
 
-}
\ No newline at end of file
+}