diff --git a/src/flux/stores/focused-perspective-store.coffee b/src/flux/stores/focused-perspective-store.coffee
index 6497ab9a7..3a86c0a98 100644
--- a/src/flux/stores/focused-perspective-store.coffee
+++ b/src/flux/stores/focused-perspective-store.coffee
@@ -113,6 +113,9 @@ class FocusedPerspectiveStore extends NylasStore
 
   sidebarAccounts: =>
     {sidebarAccountIds} = NylasEnv.savedState
-    sidebarAccountIds.map((id) => AccountStore.accountForId(id))
+    if  sidebarAccountIds
+      sidebarAccountIds.map((id) => AccountStore.accountForId(id))
+    else
+      AccountStore.accounts()
 
 module.exports = new FocusedPerspectiveStore()