diff --git a/vector/src/main/java/im/vector/riotx/features/MainActivity.kt b/vector/src/main/java/im/vector/riotx/features/MainActivity.kt
index 302ddf28b4..041eb85a11 100644
--- a/vector/src/main/java/im/vector/riotx/features/MainActivity.kt
+++ b/vector/src/main/java/im/vector/riotx/features/MainActivity.kt
@@ -176,7 +176,8 @@ class MainActivity : VectorBaseActivity() {
 
     private fun startNextActivityAndFinish() {
         val intent = when {
-            args.clearCredentials            ->
+            args.clearCredentials
+                    && !args.isUserLoggedOut ->
                 // User has explicitly asked to log out
                 LoginActivity.newIntent(this, null)
             args.isSoftLogout                ->