diff --git a/apps/red-ui/src/app/utils/main.guard.ts b/apps/red-ui/src/app/utils/main.guard.ts
index ba23864a9..9e76e6feb 100644
--- a/apps/red-ui/src/app/utils/main.guard.ts
+++ b/apps/red-ui/src/app/utils/main.guard.ts
@@ -51,7 +51,7 @@ export function mainGuard(): AsyncGuard {
             userPreferenceService.reload(),
             firstValueFrom(updatedDisplayName$),
         ]);
-
+        await tenantsService.storeTenant();
         await languageService.setInitialLanguage();
         const lastDossierTemplate = userPreferenceService.getLastDossierTemplate();
 
@@ -60,8 +60,6 @@ export function mainGuard(): AsyncGuard {
         }
 
         loadingService.stop();
-
-        await tenantsService.storeTenant();
         configService.updateIsDocumine(tenantsService.activeTenant);
 
         logger.info('[ROUTES] Main guard finished!');
diff --git a/libs/common-ui b/libs/common-ui
index 7bb24c4f9..0e6e4f7b0 160000
--- a/libs/common-ui
+++ b/libs/common-ui
@@ -1 +1 @@
-Subproject commit 7bb24c4f919faa2525c728315c4f679b1af45842
+Subproject commit 0e6e4f7b090bdd747e9e8db65201b4e8a4ff76b8