1 files changed, 1 insertions(+), 1 deletions(-)

M src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java

@@ 922,7 922,7 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
         final boolean onboardingCancel = xmppConnectionService.getPreferences().getString("onboarding_action", "").equals("cancel");
         if (onboardingCancel) xmppConnectionService.getPreferences().edit().remove("onboarding_action").commit();
 
-        if (intent != null && intent.getBooleanExtra("init", false) && !onboardingCancel) {
+        if (intent != null && intent.getBooleanExtra("init", false) && !onboardingCancel && !xmppConnectionService.getAccounts().isEmpty()) {
             Account selectedAccount = xmppConnectionService.getAccounts().get(0);
             final String accountJid = intent.getStringExtra(EXTRA_ACCOUNT);
             intent = null;