diff --git a/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts b/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts
index c9a852ae08..939fff173e 100644
--- a/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts
+++ b/npm/ng-packs/packages/core/src/lib/components/dynamic-layout.component.ts
@@ -52,9 +52,7 @@ export class DynamicLayoutComponent {
     this.router = injector.get(Router);
     this.routes = injector.get(RoutesService);
 
-    this.getLayout();
     this.checkLayoutOnNavigationEnd();
-
     this.listenToLanguageChange();
   }
 
diff --git a/npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts b/npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts
index b70434a3bc..9ac9283b5d 100644
--- a/npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts
+++ b/npm/ng-packs/packages/core/src/lib/strategies/auth-flow.strategy.ts
@@ -62,6 +62,11 @@ export abstract class AuthFlowStrategy {
     if (shouldClear) clearOAuthStorage(oAuthStorage);
 
     this.oAuthService.configure(this.oAuthConfig);
+
+    this.oAuthService.events
+      .pipe(filter(event => event.type === 'token_refresh_error'))
+      .subscribe(() => this.navigateToLogin());
+
     return this.oAuthService
       .loadDiscoveryDocument()
       .then(() => {