diff --git a/src/firebase/useFirestoreUpdates.ts b/src/firebase/useFirestoreUpdates.ts
index 8ecebc12..41dcdf20 100644
--- a/src/firebase/useFirestoreUpdates.ts
+++ b/src/firebase/useFirestoreUpdates.ts
@@ -60,8 +60,8 @@ const useFirestoreUpdates = () => {
     if (!isChatUser) return;
     if (getFirebaseCurrentUser()) {
       listenToFirestoreChanges();
-    } else if (longhornFirebaseToken) {
-      signInToFirebase(longhornFirebaseToken, listenToFirestoreChanges);
+    } else {
+      signInToFirebase(longhornFirebaseToken || '', listenToFirestoreChanges);
     }
   }, [agentRefId, longhornFirebaseToken]);
 
diff --git a/src/pages/auth/AuthActions.ts b/src/pages/auth/AuthActions.ts
index e7e24387..9383813d 100644
--- a/src/pages/auth/AuthActions.ts
+++ b/src/pages/auth/AuthActions.ts
@@ -452,8 +452,10 @@ export const getCallBridgeData = () => {
 };
 
 export const signInToFirebase = (longhornFirebaseToken: string, succesCallback: () => void) => {
+  const token =
+    longhornFirebaseToken || LocalStorage.getItem(LOCAL_STORAGE_KEYS.LONGHORN_FIREBASE_TOKEN);
   firebaseAuth()
-    .signInWithCustomToken(longhornFirebaseToken)
+    .signInWithCustomToken(token)
     .then(userCredential => {
       succesCallback();
     })