diff --git a/Tusker/Scenes/MainSceneDelegate.swift b/Tusker/Scenes/MainSceneDelegate.swift
index 8d0a38a0..e7fcf866 100644
--- a/Tusker/Scenes/MainSceneDelegate.swift
+++ b/Tusker/Scenes/MainSceneDelegate.swift
@@ -211,7 +211,10 @@ class MainSceneDelegate: UIResponder, UIWindowSceneDelegate, TuskerSceneDelegate
     }
     
     func logoutCurrent() {
-        LocalData.shared.removeAccount(LocalData.shared.getMostRecentAccount()!)
+        guard let account = window?.windowScene?.session.mastodonController?.accountInfo else {
+            return
+        }
+        LocalData.shared.removeAccount(account)
         if LocalData.shared.onboardingComplete {
             activateAccount(LocalData.shared.accounts.first!, animated: false)
         } else {