diff --git a/MailCore/Cache/AccountManager.swift b/MailCore/Cache/AccountManager.swift
index 267790310..6991161bb 100644
--- a/MailCore/Cache/AccountManager.swift
+++ b/MailCore/Cache/AccountManager.swift
@@ -365,7 +365,9 @@ public class AccountManager: RefreshTokenDelegate {
 
     public func switchAccount(newAccount: Account) {
         setCurrentAccount(account: newAccount)
-        setCurrentMailboxForCurrentAccount(mailbox: mailboxes.first!)
+        if let defaultMailbox = (mailboxes.first(where: { $0.isPrimary }) ?? mailboxes.first) {
+            setCurrentMailboxForCurrentAccount(mailbox: defaultMailbox)
+        }
         saveAccounts()
     }