diff --git a/jslib b/jslib
index aed1c5e9..bba52192 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit aed1c5e92762f1d2fa037aa9eb4d2b8e82f45707
+Subproject commit bba52192dc9dff68cd4da80398a1127235ada06e
diff --git a/src/app/services/services.module.ts b/src/app/services/services.module.ts
index 593fa7bf..1b7db3c4 100644
--- a/src/app/services/services.module.ts
+++ b/src/app/services/services.module.ts
@@ -67,7 +67,7 @@ const appIdService = new AppIdService(storageService);
 const tokenService = new TokenService(storageService);
 const apiService = new ApiService(tokenService, platformUtilsService,
     async (expired: boolean) => messagingService.send('logout', { expired: expired }));
-const environmentService = new EnvironmentService(apiService, storageService);
+const environmentService = new EnvironmentService(apiService, storageService, null);
 const userService = new UserService(tokenService, storageService);
 const containerService = new ContainerService(cryptoService, platformUtilsService);
 const authService = new AuthService(cryptoService, apiService, userService, tokenService, appIdService,
@@ -78,12 +78,10 @@ const syncService = new SyncService(configurationService, logService, cryptoFunc
 
 const analytics = new Analytics(window, () => true, platformUtilsService, storageService, appIdService);
 containerService.attachToWindow(window);
-environmentService.setUrlsFromStorage().then(() => {
-    // Do nothing
-});
 
 export function initFactory(): Function {
     return async () => {
+        await environmentService.setUrlsFromStorage();
         await i18nService.init();
         await authService.init();
         const htmlEl = window.document.documentElement;