diff --git a/ui-ngx/src/app/app.component.ts b/ui-ngx/src/app/app.component.ts
index ed289d6e67..9ac5bc79a1 100644
--- a/ui-ngx/src/app/app.component.ts
+++ b/ui-ngx/src/app/app.component.ts
@@ -21,14 +21,13 @@ import { Component, OnInit } from '@angular/core';
 import { environment as env } from '@env/environment';
 
 import { TranslateService } from '@ngx-translate/core';
-import { select, Store } from '@ngrx/store';
+import { Store } from '@ngrx/store';
 import { AppState } from '@core/core.state';
 import { LocalStorageService } from '@core/local-storage/local-storage.service';
 import { DomSanitizer } from '@angular/platform-browser';
 import { MatIconRegistry } from '@angular/material/icon';
-import { combineLatest } from 'rxjs';
-import { getCurrentAuthState, selectIsAuthenticated, selectIsUserLoaded } from '@core/auth/auth.selectors';
-import { debounceTime, filter, map, skip, tap } from 'rxjs/operators';
+import { getCurrentAuthState, selectUserReady } from '@core/auth/auth.selectors';
+import { filter, skip, tap } from 'rxjs/operators';
 import { AuthService } from '@core/auth/auth.service';
 import { svgIcons, svgIconsUrl } from '@shared/models/icon.models';
 import { ActionSettingsChangeLanguage } from '@core/settings/settings.actions';
@@ -89,12 +88,7 @@ export class AppComponent implements OnInit {
   }
 
   setupAuth() {
-    combineLatest([
-      this.store.pipe(select(selectIsAuthenticated)),
-      this.store.pipe(select(selectIsUserLoaded))]
-    ).pipe(
-      debounceTime(1),
-      map(results => ({isAuthenticated: results[0], isUserLoaded: results[1]})),
+    this.store.select(selectUserReady).pipe(
       filter((data) => data.isUserLoaded),
       tap((data) => {
         let userLang = getCurrentAuthState(this.store).userDetails?.additionalInfo?.lang ?? null;
diff --git a/ui-ngx/src/app/core/auth/auth.selectors.ts b/ui-ngx/src/app/core/auth/auth.selectors.ts
index fc8fdc18b0..0cb13c9865 100644
--- a/ui-ngx/src/app/core/auth/auth.selectors.ts
+++ b/ui-ngx/src/app/core/auth/auth.selectors.ts
@@ -42,6 +42,12 @@ export const selectIsUserLoaded = createSelector(
   (state: AuthState) => state.isUserLoaded
 );
 
+export const selectUserReady = createSelector(
+  selectIsAuthenticated,
+  selectIsUserLoaded,
+  (isAuthenticated, isUserLoaded) => ({isAuthenticated, isUserLoaded})
+);
+
 export const selectAuthUser = createSelector(
   selectAuthState,
   (state: AuthState) => state.authUser
diff --git a/ui-ngx/src/app/core/auth/auth.service.ts b/ui-ngx/src/app/core/auth/auth.service.ts
index ea3dfb4143..48018e9317 100644
--- a/ui-ngx/src/app/core/auth/auth.service.ts
+++ b/ui-ngx/src/app/core/auth/auth.service.ts
@@ -546,14 +546,14 @@ export class AuthService {
         this.notifyUserLoaded(false);
         this.loadUser(false).subscribe(
           (authPayload) => {
-            this.notifyUserLoaded(true);
             this.notifyAuthenticated(authPayload);
+            this.notifyUserLoaded(true);
             authenticatedSubject.next(true);
             authenticatedSubject.complete();
           },
           () => {
-            this.notifyUserLoaded(true);
             this.notifyUnauthenticated();
+            this.notifyUserLoaded(true);
             authenticatedSubject.next(false);
             authenticatedSubject.complete();
           }