diff --git a/src/libs/actions/Delegate.ts b/src/libs/actions/Delegate.ts
index 183d314efcd3..320f91f8a677 100644
--- a/src/libs/actions/Delegate.ts
+++ b/src/libs/actions/Delegate.ts
@@ -140,6 +140,14 @@ function connect(email: string) {
                 Onyx.update(failureData);
                 return;
             }
+            if (!activePolicyID) {
+                Log.alert('[Delegate] Unable to access activePolicyID');
+                Onyx.update(failureData);
+                return;
+            }
+            const restrictedToken = response.restrictedToken;
+            const policyID = activePolicyID;
+
             return SequentialQueue.waitForIdle()
                 .then(() => Onyx.clear(KEYS_TO_PRESERVE_DELEGATE_ACCESS))
                 .then(() => {
@@ -148,9 +156,7 @@ function connect(email: string) {
 
                     NetworkStore.setAuthToken(response?.restrictedToken ?? null);
                     confirmReadyToOpenApp();
-                    openApp();
-
-                    NativeModules.HybridAppModule.switchAccount(email, response?.restrictedToken ?? '', activePolicyID ?? '', String(previousAccountID));
+                    openApp().then(() => NativeModules.HybridAppModule.switchAccount(email, restrictedToken, policyID, String(previousAccountID)));
                 });
         })
         .catch((error) => {
@@ -210,6 +216,8 @@ function disconnect() {
                 return;
             }
 
+            const requesterEmail = response.requesterEmail;
+            const authToken = response.authToken;
             return SequentialQueue.waitForIdle()
                 .then(() => Onyx.clear(KEYS_TO_PRESERVE_DELEGATE_ACCESS))
                 .then(() => {
@@ -220,8 +228,8 @@ function disconnect() {
                     Onyx.set(ONYXKEYS.SESSION, {
                         ...stashedSession,
                         accountID: response.requesterID,
-                        email: response.requesterEmail,
-                        authToken: response.authToken,
+                        email: requesterEmail,
+                        authToken,
                         encryptedAuthToken: response.encryptedAuthToken,
                     });
                     Onyx.set(ONYXKEYS.STASHED_CREDENTIALS, {});
@@ -230,9 +238,7 @@ function disconnect() {
                     NetworkStore.setAuthToken(response?.authToken ?? null);
 
                     confirmReadyToOpenApp();
-                    openApp().then(() => {
-                        NativeModules.HybridAppModule.switchAccount(response.requesterEmail ?? '', response.authToken ?? '', '', '');
-                    });
+                    openApp().then(() => NativeModules.HybridAppModule.switchAccount(requesterEmail, authToken, '', ''));
                 });
         })
         .catch((error) => {
diff --git a/src/libs/actions/Session/index.ts b/src/libs/actions/Session/index.ts
index 630a7cb16d2a..70457b5034d7 100644
--- a/src/libs/actions/Session/index.ts
+++ b/src/libs/actions/Session/index.ts
@@ -514,7 +514,6 @@ function signInAfterTransitionFromOldDot(transitionURL: string) {
         isSingleNewDotEntry,
         primaryLogin,
         oldDotOriginalAccountEmail,
-        oldDotOriginalAccountID,
     } = Object.fromEntries(
         queryParams.split('&').map((param) => {
             const [key, value] = param.split('=');