diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 669411d9aa..db217ce161 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -201,7 +201,6 @@ export class AppComponent implements OnInit, AfterViewInit {
       if (event instanceof NavigationStart) {
         resolveEndFound = false;
         this.isRouteLoading$.next(true);
-        this.isThemeLoading$.next(true);
       } else  if (event instanceof ResolveEnd) {
         resolveEndFound = true;
         const activatedRouteSnapShot: ActivatedRouteSnapshot = event.state.root;
diff --git a/src/app/root/root.component.html b/src/app/root/root.component.html
index c8b43796cb..d187782094 100644
--- a/src/app/root/root.component.html
+++ b/src/app/root/root.component.html
@@ -1,4 +1,4 @@
-<div class="outer-wrapper" *ngIf="!shouldShowFullscreenLoader; else fullScreenLoader">
+<div class="outer-wrapper" [class.d-none]="shouldShowFullscreenLoader">
   <ds-themed-admin-sidebar></ds-themed-admin-sidebar>
   <div class="inner-wrapper" [@slideSidebarPadding]="{
      value: (!(sidebarVisible | async) ? 'hidden' : (slideSidebarOver | async) ? 'shown' : 'expanded'),
@@ -22,8 +22,7 @@
 
 <ds-notifications-board [options]="notificationOptions">
 </ds-notifications-board>
-<ng-template #fullScreenLoader>
-  <div class="ds-full-screen-loader">
-    <ds-loading [showMessage]="false"></ds-loading>
-  </div>
-</ng-template>
+
+<div class="ds-full-screen-loader" *ngIf="shouldShowFullscreenLoader">
+  <ds-loading [showMessage]="false"></ds-loading>
+</div>