diff --git a/jslib b/jslib
index 764dc40b..a20e9352 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 764dc40b36e0000807e59b8d6feea5ac4577270d
+Subproject commit a20e935268c986538ff68f72016bb8c772ea3a1b
diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts
index 77f17d52..f6176dd9 100644
--- a/src/app/vault/vault.component.ts
+++ b/src/app/vault/vault.component.ts
@@ -12,6 +12,8 @@ import {
     Router,
 } from '@angular/router';
 
+import { first } from 'rxjs/operators';
+
 import { ToasterService } from 'angular2-toaster';
 
 import { BroadcasterService } from 'jslib-angular/services/broadcaster.service';
@@ -174,12 +176,7 @@ export class VaultComponent implements OnInit, OnDestroy {
     }
 
     async load() {
-        let loaded = false;
-        const queryParamsSub = this.route.queryParams.subscribe(async params => {
-            if (loaded) {
-                return;
-            }
-            loaded = true;
+        this.route.queryParams.pipe(first()).subscribe(async params => {
             await this.groupingsComponent.load();
 
             if (params == null) {
@@ -223,9 +220,6 @@ export class VaultComponent implements OnInit, OnDestroy {
                     await this.ciphersComponent.reload();
                 }
             }
-            if (queryParamsSub != null) {
-                queryParamsSub.unsubscribe();
-            }
         });
     }