diff --git a/projects/auth0-angular/src/lib/auth.service.spec.ts b/projects/auth0-angular/src/lib/auth.service.spec.ts
index 83a433b6..73387deb 100644
--- a/projects/auth0-angular/src/lib/auth.service.spec.ts
+++ b/projects/auth0-angular/src/lib/auth.service.spec.ts
@@ -126,18 +126,35 @@ describe('AuthService', () => {
     });
 
     it('should not set isLoading when service destroyed before checkSession finished', (done) => {
-      ((auth0Client.checkSession as unknown) as jest.SpyInstance).mockImplementation(
-        () => new Promise((resolve) => setTimeout(resolve, 5000))
+      // Mock checkSession to never resolve
+      (
+        auth0Client.checkSession as unknown as jest.SpyInstance
+      ).mockImplementation(
+        () => new Promise(() => {}) // Never resolves
       );
+
       const localService = createService();
+      const loadingStates: boolean[] = [];
 
-      localService.isLoading$.pipe(bufferTime(500)).subscribe((loading) => {
-        expect(loading.length).toEqual(1);
-        expect(loading).toEqual([true]);
-        done();
-      });
+      // Subscribe to isLoading$ and collect states
+      localService.isLoading$
+        .pipe(
+          // Use a longer buffer time to ensure we catch all emissions
+          bufferTime(1000),
+          // Take only the first buffer
+          take(1)
+        )
+        .subscribe((states) => {
+          loadingStates.push(...states);
+          // Should only see the initial true state
+          expect(loadingStates).toEqual([true]);
+          done();
+        });
 
-      localService.ngOnDestroy();
+      // Destroy the service after a short delay to ensure subscription is set up
+      setTimeout(() => {
+        localService.ngOnDestroy();
+      }, 100);
     });
   });
 
@@ -151,9 +168,9 @@ describe('AuthService', () => {
     });
 
     it('should return `true` when the client is authenticated', (done) => {
-      ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-        true
-      );
+      (
+        auth0Client.isAuthenticated as unknown as jest.SpyInstance
+      ).mockResolvedValue(true);
       const service = createService();
 
       loaded(service).subscribe(() => {
@@ -165,9 +182,9 @@ describe('AuthService', () => {
     });
 
     it('should return true after successfully getting a new token', (done) => {
-      ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-        false
-      );
+      (
+        auth0Client.isAuthenticated as unknown as jest.SpyInstance
+      ).mockResolvedValue(false);
 
       const service = createService();
       service.isAuthenticated$.pipe(bufferCount(2)).subscribe((values) => {
@@ -179,12 +196,12 @@ describe('AuthService', () => {
       // Add a small delay before triggering a new emit to the isAuthenticated$.
       // This ensures we can capture both emits using the above bufferCount(2)
       setTimeout(() => {
-        ((auth0Client.getTokenSilently as unknown) as jest.SpyInstance).mockResolvedValue(
-          {}
-        );
-        ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-          true
-        );
+        (
+          auth0Client.getTokenSilently as unknown as jest.SpyInstance
+        ).mockResolvedValue({});
+        (
+          auth0Client.isAuthenticated as unknown as jest.SpyInstance
+        ).mockResolvedValue(true);
 
         service.getAccessTokenSilently().subscribe();
       }, 0);
@@ -194,9 +211,9 @@ describe('AuthService', () => {
       done: any
     ) => {
       authState.setIsLoading(false);
-      ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-        true
-      );
+      (
+        auth0Client.isAuthenticated as unknown as jest.SpyInstance
+      ).mockResolvedValue(true);
 
       const service = createService();
 
@@ -207,9 +224,9 @@ describe('AuthService', () => {
       // When the token is expired, auth0Client.isAuthenticated is resolving to false.
       // This is unexpected but known behavior in Auth0-SPA-JS, so we shouldnt rely on it apart from initially.
       // Once this is resolved, we should be able to rely on `auth0Client.isAuthenticated`, even when the Access Token is expired.
-      ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-        false
-      );
+      (
+        auth0Client.isAuthenticated as unknown as jest.SpyInstance
+      ).mockResolvedValue(false);
 
       service.isAuthenticated$.pipe(take(1)).subscribe((value) => {
         expect(value).toBe(true);
@@ -223,10 +240,10 @@ describe('AuthService', () => {
         name: 'Test User',
       };
 
-      ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-        true
-      );
-      ((auth0Client.getUser as unknown) as jest.SpyInstance).mockResolvedValue(
+      (
+        auth0Client.isAuthenticated as unknown as jest.SpyInstance
+      ).mockResolvedValue(true);
+      (auth0Client.getUser as unknown as jest.SpyInstance).mockResolvedValue(
         user
       );
 
@@ -246,10 +263,10 @@ describe('AuthService', () => {
         name: 'Another User',
       };
 
-      ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-        true
-      );
-      ((auth0Client.getUser as unknown) as jest.SpyInstance).mockResolvedValue(
+      (
+        auth0Client.isAuthenticated as unknown as jest.SpyInstance
+      ).mockResolvedValue(true);
+      (auth0Client.getUser as unknown as jest.SpyInstance).mockResolvedValue(
         user
       );
 
@@ -263,10 +280,10 @@ describe('AuthService', () => {
       // Add a small delay before triggering a new emit to the user$.
       // This ensures we can capture both emits using the above bufferCount(2)
       setTimeout(() => {
-        ((auth0Client.getTokenSilently as unknown) as jest.SpyInstance).mockResolvedValue(
-          {}
-        );
-        ((auth0Client.getUser as unknown) as jest.SpyInstance).mockResolvedValue(
+        (
+          auth0Client.getTokenSilently as unknown as jest.SpyInstance
+        ).mockResolvedValue({});
+        (auth0Client.getUser as unknown as jest.SpyInstance).mockResolvedValue(
           user2
         );
 
@@ -279,10 +296,10 @@ describe('AuthService', () => {
         name: 'Test User',
       };
 
-      ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-        true
-      );
-      ((auth0Client.getUser as unknown) as jest.SpyInstance).mockResolvedValue(
+      (
+        auth0Client.isAuthenticated as unknown as jest.SpyInstance
+      ).mockResolvedValue(true);
+      (auth0Client.getUser as unknown as jest.SpyInstance).mockResolvedValue(
         user
       );
 
@@ -294,12 +311,14 @@ describe('AuthService', () => {
       });
 
       service.isAuthenticated$.pipe(filter(Boolean)).subscribe(() => {
-        ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-          false
-        );
-        service.logout({
-          openUrl: false,
-        });
+        (
+          auth0Client.isAuthenticated as unknown as jest.SpyInstance
+        ).mockResolvedValue(false);
+        service
+          .logout({
+            openUrl: false,
+          })
+          .subscribe();
       });
     });
 
@@ -308,13 +327,13 @@ describe('AuthService', () => {
         name: 'Test User',
       };
 
-      ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-        true
-      );
-      ((auth0Client.getTokenSilently as unknown) as jest.SpyInstance).mockResolvedValue(
-        'AT1'
-      );
-      ((auth0Client.getUser as unknown) as jest.SpyInstance).mockResolvedValue(
+      (
+        auth0Client.isAuthenticated as unknown as jest.SpyInstance
+      ).mockResolvedValue(true);
+      (
+        auth0Client.getTokenSilently as unknown as jest.SpyInstance
+      ).mockResolvedValue('AT1');
+      (auth0Client.getUser as unknown as jest.SpyInstance).mockResolvedValue(
         user
       );
 
@@ -326,15 +345,15 @@ describe('AuthService', () => {
         .getAccessTokenSilently()
         .pipe(
           tap(() =>
-            ((auth0Client.getTokenSilently as unknown) as jest.SpyInstance).mockResolvedValue(
-              'AT2'
-            )
+            (
+              auth0Client.getTokenSilently as unknown as jest.SpyInstance
+            ).mockResolvedValue('AT2')
           ),
           mergeMap(() => service.getAccessTokenSilently()),
           tap(() =>
-            ((auth0Client.getTokenSilently as unknown) as jest.SpyInstance).mockResolvedValue(
-              'AT3'
-            )
+            (
+              auth0Client.getTokenSilently as unknown as jest.SpyInstance
+            ).mockResolvedValue('AT3')
           ),
           mergeMap(() => service.getAccessTokenSilently()),
           // Allow user emissions to come through
@@ -356,12 +375,12 @@ describe('AuthService', () => {
         iss: 'https://example.eu.auth0.com/',
       };
 
-      ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-        true
-      );
-      ((auth0Client.getIdTokenClaims as unknown) as jest.SpyInstance).mockResolvedValue(
-        claims
-      );
+      (
+        auth0Client.isAuthenticated as unknown as jest.SpyInstance
+      ).mockResolvedValue(true);
+      (
+        auth0Client.getIdTokenClaims as unknown as jest.SpyInstance
+      ).mockResolvedValue(claims);
       const service = createService();
 
       service.idTokenClaims$.subscribe((value) => {
@@ -385,12 +404,12 @@ describe('AuthService', () => {
         iss: 'https://example.eu.auth0.com/',
       };
 
-      ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-        true
-      );
-      ((auth0Client.getIdTokenClaims as unknown) as jest.SpyInstance).mockResolvedValue(
-        claims
-      );
+      (
+        auth0Client.isAuthenticated as unknown as jest.SpyInstance
+      ).mockResolvedValue(true);
+      (
+        auth0Client.getIdTokenClaims as unknown as jest.SpyInstance
+      ).mockResolvedValue(claims);
 
       const service = createService();
       service.idTokenClaims$.pipe(bufferCount(2)).subscribe((values) => {
@@ -402,12 +421,12 @@ describe('AuthService', () => {
       // Add a small delay before triggering a new emit to the idTokenClaims$.
       // This ensures we can capture both emits using the above bufferCount(2)
       setTimeout(() => {
-        ((auth0Client.getTokenSilently as unknown) as jest.SpyInstance).mockResolvedValue(
-          {}
-        );
-        ((auth0Client.getIdTokenClaims as unknown) as jest.SpyInstance).mockResolvedValue(
-          claims2
-        );
+        (
+          auth0Client.getTokenSilently as unknown as jest.SpyInstance
+        ).mockResolvedValue({});
+        (
+          auth0Client.getIdTokenClaims as unknown as jest.SpyInstance
+        ).mockResolvedValue(claims2);
 
         service.getAccessTokenSilently().subscribe();
       }, 0);
@@ -421,12 +440,12 @@ describe('AuthService', () => {
         iss: 'https://example.eu.auth0.com/',
       };
 
-      ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-        true
-      );
-      ((auth0Client.getIdTokenClaims as unknown) as jest.SpyInstance).mockResolvedValue(
-        claims
-      );
+      (
+        auth0Client.isAuthenticated as unknown as jest.SpyInstance
+      ).mockResolvedValue(true);
+      (
+        auth0Client.getIdTokenClaims as unknown as jest.SpyInstance
+      ).mockResolvedValue(claims);
 
       const service = createService();
       service.idTokenClaims$.pipe(bufferCount(2)).subscribe((values) => {
@@ -436,12 +455,14 @@ describe('AuthService', () => {
       });
 
       service.isAuthenticated$.pipe(filter(Boolean)).subscribe(() => {
-        ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-          false
-        );
-        service.logout({
-          openUrl: false,
-        });
+        (
+          auth0Client.isAuthenticated as unknown as jest.SpyInstance
+        ).mockResolvedValue(false);
+        service
+          .logout({
+            openUrl: false,
+          })
+          .subscribe();
       });
     });
   });
@@ -509,13 +530,13 @@ describe('AuthService', () => {
     });
 
     it('should redirect to the route specified in appState', (done) => {
-      ((auth0Client.handleRedirectCallback as unknown) as jest.SpyInstance).mockResolvedValue(
-        {
-          appState: {
-            target: '/test-route',
-          },
-        }
-      );
+      (
+        auth0Client.handleRedirectCallback as unknown as jest.SpyInstance
+      ).mockResolvedValue({
+        appState: {
+          target: '/test-route',
+        },
+      });
 
       const localService = createService();
 
@@ -526,9 +547,9 @@ describe('AuthService', () => {
     });
 
     it('should fallback to `/` when missing appState', (done) => {
-      ((auth0Client.handleRedirectCallback as unknown) as jest.SpyInstance).mockResolvedValue(
-        {}
-      );
+      (
+        auth0Client.handleRedirectCallback as unknown as jest.SpyInstance
+      ).mockResolvedValue({});
 
       const localService = createService();
 
@@ -539,9 +560,9 @@ describe('AuthService', () => {
     });
 
     it('should fallback to `/` when handleRedirectCallback returns undefined', (done) => {
-      ((auth0Client.handleRedirectCallback as unknown) as jest.SpyInstance).mockResolvedValue(
-        undefined
-      );
+      (
+        auth0Client.handleRedirectCallback as unknown as jest.SpyInstance
+      ).mockResolvedValue(undefined);
 
       const localService = createService();
 
@@ -556,11 +577,11 @@ describe('AuthService', () => {
         myValue: 'State to Preserve',
       };
 
-      ((auth0Client.handleRedirectCallback as unknown) as jest.SpyInstance).mockResolvedValue(
-        {
-          appState,
-        }
-      );
+      (
+        auth0Client.handleRedirectCallback as unknown as jest.SpyInstance
+      ).mockResolvedValue({
+        appState,
+      });
 
       const localService = createService();
 
@@ -573,11 +594,11 @@ describe('AuthService', () => {
     it('should record errors in the error$ observable', (done) => {
       const errorObj = new Error('An error has occured');
 
-      ((auth0Client.handleRedirectCallback as unknown) as jest.SpyInstance).mockImplementation(
-        () => {
-          throw errorObj;
-        }
-      );
+      (
+        auth0Client.handleRedirectCallback as unknown as jest.SpyInstance
+      ).mockImplementation(() => {
+        throw errorObj;
+      });
 
       const localService = createService();
 
@@ -594,11 +615,11 @@ describe('AuthService', () => {
       const errorObj = new Error('An error has occured');
 
       authConfig.errorPath = '/error';
-      ((auth0Client.handleRedirectCallback as unknown) as jest.SpyInstance).mockImplementation(
-        () => {
-          throw errorObj;
-        }
-      );
+      (
+        auth0Client.handleRedirectCallback as unknown as jest.SpyInstance
+      ).mockImplementation(() => {
+        throw errorObj;
+      });
 
       const localService = createService();
 
@@ -654,10 +675,10 @@ describe('AuthService', () => {
   it('should call `loginWithPopup`', (done) => {
     const service = createService();
     loaded(service).subscribe(() => {
-      ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockReset();
-      ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-        true
-      );
+      (auth0Client.isAuthenticated as unknown as jest.SpyInstance).mockReset();
+      (
+        auth0Client.isAuthenticated as unknown as jest.SpyInstance
+      ).mockResolvedValue(true);
 
       service.loginWithPopup();
 
@@ -679,10 +700,10 @@ describe('AuthService', () => {
     const service = createService();
 
     loaded(service).subscribe(() => {
-      ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockReset();
-      ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-        true
-      );
+      (auth0Client.isAuthenticated as unknown as jest.SpyInstance).mockReset();
+      (
+        auth0Client.isAuthenticated as unknown as jest.SpyInstance
+      ).mockResolvedValue(true);
 
       service.loginWithPopup(options, config);
 
@@ -714,15 +735,15 @@ describe('AuthService', () => {
   it('should reset the authentication state when passing `localOnly` to logout', (done) => {
     const options = {
       openUrl: async () => {
-        ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-          false
-        );
+        (
+          auth0Client.isAuthenticated as unknown as jest.SpyInstance
+        ).mockResolvedValue(false);
       },
     };
 
-    ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-      true
-    );
+    (
+      auth0Client.isAuthenticated as unknown as jest.SpyInstance
+    ).mockResolvedValue(true);
 
     const service = createService();
 
@@ -733,7 +754,7 @@ describe('AuthService', () => {
         done();
       });
 
-      service.logout(options);
+      service.logout(options).subscribe();
     });
   });
 
@@ -763,9 +784,9 @@ describe('AuthService', () => {
         id_token: '456',
         expires_in: 2,
       };
-      ((auth0Client.getTokenSilently as unknown) as jest.SpyInstance).mockResolvedValue(
-        tokenResponse
-      );
+      (
+        auth0Client.getTokenSilently as unknown as jest.SpyInstance
+      ).mockResolvedValue(tokenResponse);
 
       const service = createService();
       service
@@ -777,25 +798,23 @@ describe('AuthService', () => {
     });
 
     it('should null when nothing in cache', (done) => {
-      ((auth0Client.getTokenSilently as unknown) as jest.SpyInstance).mockResolvedValue(
-        null
-      );
+      (
+        auth0Client.getTokenSilently as unknown as jest.SpyInstance
+      ).mockResolvedValue(null);
 
       const service = createService();
-      service
-        .getAccessTokenSilently()
-        .subscribe((token) => {
-          expect(token).toBeNull();
-          done();
-        });
+      service.getAccessTokenSilently().subscribe((token) => {
+        expect(token).toBeNull();
+        done();
+      });
     });
 
     it('should record errors in the error$ observable', (done) => {
       const errorObj = new Error('An error has occured');
 
-      ((auth0Client.getTokenSilently as unknown) as jest.SpyInstance).mockRejectedValue(
-        errorObj
-      );
+      (
+        auth0Client.getTokenSilently as unknown as jest.SpyInstance
+      ).mockRejectedValue(errorObj);
       const service = createService();
 
       service.getAccessTokenSilently().subscribe({
@@ -811,9 +830,9 @@ describe('AuthService', () => {
     it('should bubble errors', (done) => {
       const errorObj = new Error('An error has occured');
 
-      ((auth0Client.getTokenSilently as unknown) as jest.SpyInstance).mockRejectedValue(
-        errorObj
-      );
+      (
+        auth0Client.getTokenSilently as unknown as jest.SpyInstance
+      ).mockRejectedValue(errorObj);
       const service = createService();
 
       service.getAccessTokenSilently().subscribe({
@@ -848,9 +867,9 @@ describe('AuthService', () => {
     it('should record errors in the error$ observable', (done) => {
       const errorObj = new Error('An error has occured');
 
-      ((auth0Client.getTokenWithPopup as unknown) as jest.SpyInstance).mockRejectedValue(
-        errorObj
-      );
+      (
+        auth0Client.getTokenWithPopup as unknown as jest.SpyInstance
+      ).mockRejectedValue(errorObj);
 
       const service = createService();
       service.getAccessTokenWithPopup().subscribe({
@@ -866,9 +885,9 @@ describe('AuthService', () => {
     it('should bubble errors', (done) => {
       const errorObj = new Error('An error has occured');
 
-      ((auth0Client.getTokenWithPopup as unknown) as jest.SpyInstance).mockRejectedValue(
-        errorObj
-      );
+      (
+        auth0Client.getTokenWithPopup as unknown as jest.SpyInstance
+      ).mockRejectedValue(errorObj);
 
       const service = createService();
       service.getAccessTokenWithPopup().subscribe({
@@ -948,9 +967,9 @@ describe('AuthService', () => {
         .pipe(
           filter((isLoading) => !isLoading),
           tap(() =>
-            ((auth0Client.isAuthenticated as unknown) as jest.SpyInstance).mockResolvedValue(
-              true
-            )
+            (
+              auth0Client.isAuthenticated as unknown as jest.SpyInstance
+            ).mockResolvedValue(true)
           ),
           mergeMap(() => localService.handleRedirectCallback())
         )
@@ -962,11 +981,11 @@ describe('AuthService', () => {
         myValue: 'State to Preserve',
       };
 
-      ((auth0Client.handleRedirectCallback as unknown) as jest.SpyInstance).mockResolvedValue(
-        {
-          appState,
-        }
-      );
+      (
+        auth0Client.handleRedirectCallback as unknown as jest.SpyInstance
+      ).mockResolvedValue({
+        appState,
+      });
 
       const localService = createService();
       localService.handleRedirectCallback().subscribe(() => {
@@ -976,5 +995,106 @@ describe('AuthService', () => {
         });
       });
     });
+
+    it('should ensure isAuthenticated$ has correct value after refresh', (done) => {
+      // Simulate the authentication state changing. isAuthenticatedTrigger$ calls isAuthenticated()
+      // twice at the start of the stream, and then once after the refresh completes.
+      (auth0Client.isAuthenticated as unknown as jest.SpyInstance)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValueOnce(false)
+        .mockResolvedValue(true);
+
+      const service = createService();
+      authState.setIsLoading(false);
+      const authStates: boolean[] = [];
+
+      // Subscribe to isAuthenticated$ before triggering the refresh
+      service.isAuthenticated$.pipe(bufferCount(2)).subscribe((states) => {
+        authStates.push(...states);
+        expect(authStates).toEqual([false, true]);
+        done();
+      });
+
+      service.handleRedirectCallback().subscribe();
+    });
+
+    it('should not wait for refresh when already loading', (done) => {
+      const service = createService();
+
+      // Track isAuthenticated$ values
+      const authStates: boolean[] = [];
+      service.isAuthenticated$
+        .pipe(bufferTime(100), take(1))
+        .subscribe((states) => {
+          authStates.push(...states);
+
+          // Should only have one state change since we're not waiting for refresh
+          expect(authStates).toEqual([false]);
+          expect(callbackComplete).toBe(true);
+          done();
+        });
+
+      let callbackComplete = false;
+      service.handleRedirectCallback().subscribe(() => {
+        callbackComplete = true;
+      });
+    });
+  });
+
+  describe('logout', () => {
+    it('should return not call refresh when openUrl is undefined', (done) => {
+      const service = createService();
+      const refreshSpy = jest.spyOn(authState, 'refresh');
+
+      service.logout({ openUrl: undefined }).subscribe(() => {
+        expect(refreshSpy).not.toHaveBeenCalled();
+        done();
+      });
+    });
+
+    it('should wait for refresh to complete when openUrl is false', (done) => {
+      const service = createService();
+      authState.setIsLoading(false);
+
+      // Simulate the authentication state changing. isAuthenticatedTrigger$ calls isAuthenticated()
+      // twice at the start of the stream, and then once after the refresh completes.
+      (auth0Client.isAuthenticated as unknown as jest.SpyInstance)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValue(false);
+
+      const authStates: boolean[] = [];
+
+      // Subscribe to isAuthenticated$ before triggering the refresh
+      service.isAuthenticated$.pipe(bufferCount(2)).subscribe((states) => {
+        authStates.push(...states);
+        expect(authStates).toEqual([true, false]);
+        done();
+      });
+
+      service.logout({ openUrl: false }).subscribe();
+    });
+
+    it('should wait for refresh to complete when openUrl is a function', (done) => {
+      const service = createService();
+      authState.setIsLoading(false);
+
+      // Simulate the authentication state changing
+      (auth0Client.isAuthenticated as unknown as jest.SpyInstance)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(true)
+        .mockResolvedValueOnce(false);
+
+      const authStates: boolean[] = [];
+
+      // Subscribe to isAuthenticated$ before triggering the refresh
+      service.isAuthenticated$.pipe(bufferCount(2)).subscribe((states) => {
+        authStates.push(...states);
+        expect(authStates).toEqual([true, false]);
+        done();
+      });
+
+      service.logout({ openUrl: () => {} }).subscribe();
+    });
   });
 });
diff --git a/projects/auth0-angular/src/lib/auth.service.ts b/projects/auth0-angular/src/lib/auth.service.ts
index a2b61f5e..94ed94d8 100644
--- a/projects/auth0-angular/src/lib/auth.service.ts
+++ b/projects/auth0-angular/src/lib/auth.service.ts
@@ -29,6 +29,8 @@ import {
   catchError,
   switchMap,
   withLatestFrom,
+  filter,
+  take,
 } from 'rxjs/operators';
 
 import { Auth0ClientService } from './auth.client';
@@ -36,7 +38,7 @@ import { AbstractNavigator } from './abstract-navigator';
 import { AuthClientConfig, AppState } from './auth.config';
 import { AuthState } from './auth.state';
 import { LogoutOptions, RedirectLoginOptions } from './interfaces';
-
+import { RefreshState } from './refresh-state';
 @Injectable({
   providedIn: 'root',
 })
@@ -182,11 +184,18 @@ export class AuthService<TAppState extends AppState = AppState>
    * @param options The logout options
    */
   logout(options?: LogoutOptions): Observable<void> {
-    return from(
-      this.auth0Client.logout(options).then(() => {
-        if (options?.openUrl === false || options?.openUrl) {
-          this.authState.refresh();
+    return from(this.auth0Client.logout(options)).pipe(
+      concatMap(() => {
+        if (options?.openUrl === undefined) {
+          return of(undefined);
         }
+
+        this.authState.refresh();
+        return this.authState.refresh$.pipe(
+          filter((state) => state === RefreshState.Complete),
+          take(1),
+          map(() => undefined)
+        );
       })
     );
   }
@@ -309,10 +318,7 @@ export class AuthService<TAppState extends AppState = AppState>
       this.auth0Client.handleRedirectCallback<TAppState>(url)
     ).pipe(
       withLatestFrom(this.authState.isLoading$),
-      tap(([result, isLoading]) => {
-        if (!isLoading) {
-          this.authState.refresh();
-        }
+      concatMap(([result, isLoading]) => {
         const appState = result?.appState;
         const target = appState?.target ?? '/';
 
@@ -320,9 +326,23 @@ export class AuthService<TAppState extends AppState = AppState>
           this.appStateSubject$.next(appState);
         }
 
-        this.navigator.navigateByUrl(target);
-      }),
-      map(([result]) => result)
+        if (isLoading) {
+          this.navigator.navigateByUrl(target);
+          return of(result);
+        }
+
+        this.authState.refresh();
+
+        // Wait for the refresh to complete before navigating
+        return this.authState.refresh$.pipe(
+          filter((state) => state === RefreshState.Complete),
+          take(1),
+          // Wait for the refresh to complete before navigating,
+          // otherwise an auth.guard could have a stale isAuthenticated value
+          tap(() => this.navigator.navigateByUrl(target)),
+          map(() => result)
+        );
+      })
     );
   }
 
diff --git a/projects/auth0-angular/src/lib/auth.state.ts b/projects/auth0-angular/src/lib/auth.state.ts
index 7fe85559..ce915fdf 100644
--- a/projects/auth0-angular/src/lib/auth.state.ts
+++ b/projects/auth0-angular/src/lib/auth.state.ts
@@ -1,4 +1,4 @@
-import { Inject, Injectable } from '@angular/core';
+import { Inject, Injectable, OnDestroy } from '@angular/core';
 import { Auth0Client } from '@auth0/auth0-spa-js';
 import {
   BehaviorSubject,
@@ -16,16 +16,18 @@ import {
   scan,
   shareReplay,
   switchMap,
+  takeUntil,
+  tap,
 } from 'rxjs/operators';
 import { Auth0ClientService } from './auth.client';
+import { RefreshState } from './refresh-state';
 
-/**
- * Tracks the Authentication State for the SDK
- */
 @Injectable({ providedIn: 'root' })
-export class AuthState {
+export class AuthState implements OnDestroy {
+  // https://stackoverflow.com/a/41177163
+  private ngUnsubscribe$ = new Subject<void>();
   private isLoadingSubject$ = new BehaviorSubject<boolean>(true);
-  private refresh$ = new Subject<void>();
+  private refreshSubject$ = new Subject<RefreshState>();
   private accessToken$ = new ReplaySubject<string>(1);
   private errorSubject$ = new ReplaySubject<Error>(1);
 
@@ -34,6 +36,11 @@ export class AuthState {
    */
   public readonly isLoading$ = this.isLoadingSubject$.asObservable();
 
+  /**
+   * Emits the current state of refresh operations after a change in authentication state is made.
+   */
+  public readonly refresh$ = this.refreshSubject$.asObservable();
+
   /**
    * Trigger used to pull User information from the Auth0Client.
    * Triggers when the access token has changed.
@@ -52,6 +59,15 @@ export class AuthState {
     filter(({ previous, current }) => previous !== current)
   );
 
+  /**
+   * Stream that handles refresh state completion independently of isAuthenticated$ subscriptions
+   */
+  private readonly refreshCompletion$ = this.refreshSubject$.pipe(
+    filter((state) => state === RefreshState.Refreshing),
+    mergeMap(() => this.auth0Client.isAuthenticated()),
+    tap(() => this.refreshSubject$.next(RefreshState.Complete))
+  );
+
   /**
    * Trigger used to pull User information from the Auth0Client.
    * Triggers when an event occurs that needs to retrigger the User Profile information.
@@ -71,7 +87,7 @@ export class AuthState {
         this.accessTokenTrigger$.pipe(
           mergeMap(() => this.auth0Client.isAuthenticated())
         ),
-        this.refresh$.pipe(mergeMap(() => this.auth0Client.isAuthenticated()))
+        this.refreshCompletion$
       )
     )
   );
@@ -109,7 +125,10 @@ export class AuthState {
    */
   public readonly error$ = this.errorSubject$.asObservable();
 
-  constructor(@Inject(Auth0ClientService) private auth0Client: Auth0Client) {}
+  constructor(@Inject(Auth0ClientService) private auth0Client: Auth0Client) {
+    // Subscribe to refreshCompletion$ to ensure refresh state completes
+    this.refreshCompletion$.pipe(takeUntil(this.ngUnsubscribe$)).subscribe();
+  }
 
   /**
    * Update the isLoading state using the provided value
@@ -125,7 +144,7 @@ export class AuthState {
    * reflect the most up-to-date values from  Auth0Client.
    */
   public refresh(): void {
-    this.refresh$.next();
+    this.refreshSubject$.next(RefreshState.Refreshing);
   }
 
   /**
@@ -145,4 +164,13 @@ export class AuthState {
   public setError(error: any): void {
     this.errorSubject$.next(error);
   }
+
+  ngOnDestroy(): void {
+    this.ngUnsubscribe$.next();
+    this.ngUnsubscribe$.complete();
+    this.isLoadingSubject$.complete();
+    this.refreshSubject$.complete();
+    this.accessToken$.complete();
+    this.errorSubject$.complete();
+  }
 }
diff --git a/projects/auth0-angular/src/lib/refresh-state.ts b/projects/auth0-angular/src/lib/refresh-state.ts
new file mode 100644
index 00000000..4f4a1742
--- /dev/null
+++ b/projects/auth0-angular/src/lib/refresh-state.ts
@@ -0,0 +1,8 @@
+/**
+ * Tracks the state of refresh operations
+ */
+export const RefreshState = {
+  Refreshing: 'Refreshing',
+  Complete: 'Complete',
+} as const;
+export type RefreshState = (typeof RefreshState)[keyof typeof RefreshState];