diff --git a/app/stores/AuthStore.ts b/app/stores/AuthStore.ts
index 54bd1c890..4eb68efb2 100644
--- a/app/stores/AuthStore.ts
+++ b/app/stores/AuthStore.ts
@@ -157,7 +157,7 @@ export default class AuthStore extends Store<Team> {
   /** The current team */
   @computed
   get team() {
-    return this.orderedData[0];
+    return this.currentTeamId ? this.get(this.currentTeamId) : undefined;
   }
 
   /** The current team's policies */