diff --git a/jslib b/jslib
index 799c90af..e6fde2e9 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 799c90af1702c681874cb8fce8f8adcf1049d0c8
+Subproject commit e6fde2e92be4be472933234daa7bae242ee17794
diff --git a/src/app/services.module.ts b/src/app/services.module.ts
index 466e4743..13a3fe5d 100644
--- a/src/app/services.module.ts
+++ b/src/app/services.module.ts
@@ -90,7 +90,7 @@ const folderService = new FolderService(cryptoService, userService,
     () => i18nService.t('noneFolder'), apiService, storageService, i18nService);
 const collectionService = new CollectionService(cryptoService, userService, storageService, i18nService);
 const lockService = new LockService(cipherService, folderService, collectionService,
-    cryptoService, platformUtilsService, storageService, messagingService, () => { /* do nothing */ });
+    cryptoService, platformUtilsService, storageService, messagingService, null);
 const syncService = new SyncService(userService, apiService, settingsService,
     folderService, cipherService, cryptoService, collectionService, storageService, messagingService,
     async (expired: boolean) => messagingService.send('logout', { expired: expired }));
@@ -109,6 +109,7 @@ environmentService.setUrlsFromStorage().then(() => {
 
 export function initFactory(): Function {
     return async () => {
+        lockService.init(true);
         const locale = await storageService.get<string>(ConstantsService.localeKey);
         await i18nService.init(locale);
         await authService.init();