diff --git a/npm/ng-packs/packages/oauth/src/lib/strategies/auth-code-flow-strategy.ts b/npm/ng-packs/packages/oauth/src/lib/strategies/auth-code-flow-strategy.ts
index 7b1e0c108a..0452fdc899 100644
--- a/npm/ng-packs/packages/oauth/src/lib/strategies/auth-code-flow-strategy.ts
+++ b/npm/ng-packs/packages/oauth/src/lib/strategies/auth-code-flow-strategy.ts
@@ -51,6 +51,10 @@ export class AuthCodeFlowStrategy extends AuthFlowStrategy {
 
   logout(queryParams?: Params) {
     this.rememberMeService.remove();
+    if (queryParams?.noRedirectToLogoutUrl) {
+      this.router.navigate(['/']);
+      return from(this.oAuthService.revokeTokenAndLogout(true));
+    }
     return from(this.oAuthService.revokeTokenAndLogout(this.getCultureParams(queryParams)));
   }
 
diff --git a/npm/ng-packs/packages/theme-shared/src/lib/services/authentication-error-handler.service.ts b/npm/ng-packs/packages/theme-shared/src/lib/services/authentication-error-handler.service.ts
index 602514bee8..44dab7e0a1 100644
--- a/npm/ng-packs/packages/theme-shared/src/lib/services/authentication-error-handler.service.ts
+++ b/npm/ng-packs/packages/theme-shared/src/lib/services/authentication-error-handler.service.ts
@@ -17,7 +17,7 @@ export class AbpAuthenticationErrorHandler implements CustomHttpErrorHandlerServ
   execute() {
     this.configStateService.refreshAppState().subscribe(({ currentUser }) => {
       if (!currentUser.isAuthenticated) {
-        this.authService.logout();
+        this.authService.logout({ noRedirectToLogoutUrl: true });
       }
     });
   }