diff --git a/src/auth.ts b/src/auth.ts
index 608837fb6fa..6f13cfe36fd 100644
--- a/src/auth.ts
+++ b/src/auth.ts
@@ -110,13 +110,10 @@ export function getAllAccounts(): Account[] {
  * @param options options object.
  * @param account account to make active.
  */
-export function setActiveAccount(options: any, account: Account) {
+export async function setActiveAccount(options: any, account: Account) {
   if (account.tokens.refresh_token) {
     setRefreshToken(account.tokens.refresh_token);
-  }
-
-  if (account.tokens.access_token) {
-    setAccessToken(account.tokens.access_token);
+    setAccessToken(await apiv2.getAccessToken());
   }
 
   options.user = account.user;
diff --git a/src/command.ts b/src/command.ts
index 7d400377367..427cc31e885 100644
--- a/src/command.ts
+++ b/src/command.ts
@@ -319,7 +319,7 @@ export class Command {
     const activeAccount = selectAccount(account, projectRoot);
 
     if (activeAccount) {
-      setActiveAccount(options, activeAccount);
+      await setActiveAccount(options, activeAccount);
     }
 
     this.applyRC(options);
diff --git a/src/init/features/account.ts b/src/init/features/account.ts
index a40184bb7d3..506a46074f3 100644
--- a/src/init/features/account.ts
+++ b/src/init/features/account.ts
@@ -73,7 +73,7 @@ export async function doSetup(setup: any, config: any, options: any): Promise<vo
   }
 
   // Set the global auth state
-  setActiveAccount(options, account);
+  await setActiveAccount(options, account);
 
   // Set the project default user
   if (config.projectDir) {
diff --git a/src/requireAuth.ts b/src/requireAuth.ts
index 112e18f5664..39a5b41ed75 100644
--- a/src/requireAuth.ts
+++ b/src/requireAuth.ts
@@ -51,7 +51,10 @@ async function autoAuth(options: Options, authScopes: string[]): Promise<void |
   }
   if (process.env.MONOSPACE_ENV && token && clientEmail) {
     // Within monospace, this a OAuth token for the user, so we make it the active user.
-    setActiveAccount(options, { user: { email: clientEmail }, tokens: { access_token: token } });
+    await setActiveAccount(options, {
+      user: { email: clientEmail },
+      tokens: { access_token: token },
+    });
     setGlobalDefaultAccount({ user: { email: clientEmail }, tokens: { access_token: token } });
 
     // project is also selected in monospace auth flow
@@ -107,6 +110,6 @@ export async function requireAuth(options: any): Promise<string | void> {
     throw new FirebaseError(AUTH_ERROR_MESSAGE);
   }
 
-  setActiveAccount(options, { user, tokens });
+  await setActiveAccount(options, { user, tokens });
   return user.email;
 }