diff --git a/src/services/constants.service.ts b/src/services/constants.service.ts
index 6ae5038d52d..4a5f96dd609 100644
--- a/src/services/constants.service.ts
+++ b/src/services/constants.service.ts
@@ -56,12 +56,12 @@ export class ConstantsService {
 
     twoFactorProviderInfo: any[];
 
-    constructor(i18nService: any, platformUtilsService: PlatformUtilsService) {
-        if (platformUtilsService.isEdge()) {
+    constructor(i18nService: any, delayLoad: number) {
+        if (delayLoad && delayLoad > 0) {
             // delay for i18n fetch
             setTimeout(() => {
                 this.bootstrap(i18nService);
-            }, 1000);
+            }, delayLoad);
         } else {
             this.bootstrap(i18nService);
         }
diff --git a/src/services/folder.service.ts b/src/services/folder.service.ts
index a1ba9718ea0..aa027fdd6af 100644
--- a/src/services/folder.service.ts
+++ b/src/services/folder.service.ts
@@ -20,7 +20,7 @@ export class FolderService implements FolderServiceInterface {
     decryptedFolderCache: any[];
 
     constructor(private cryptoService: CryptoService, private userService: UserService,
-        private noneFolder: string, private apiService: ApiService,
+        private noneFolder: () => string, private apiService: ApiService,
         private storageService: StorageService) {
     }
 
@@ -66,7 +66,7 @@ export class FolderService implements FolderServiceInterface {
 
         const decFolders: any[] = [{
             id: null,
-            name: this.noneFolder,
+            name: this.noneFolder(),
         }];
 
         const key = await this.cryptoService.getKey();