diff --git a/jslib b/jslib
index cb7336c0e8..cbcf0adad5 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit cb7336c0e8ae1f0f74c76a4d6704555cc7440a3b
+Subproject commit cbcf0adad5f313c1f37232311ddce318365911b3
diff --git a/src/popup/settings/folder-add-edit.component.ts b/src/popup/settings/folder-add-edit.component.ts
index 73d5509fc8..98b1c8fa83 100644
--- a/src/popup/settings/folder-add-edit.component.ts
+++ b/src/popup/settings/folder-add-edit.component.ts
@@ -29,7 +29,9 @@ export class FolderAddEditComponent extends BaseFolderAddEditComponent {
                 this.folderId = params.folderId;
             }
             await super.ngOnInit();
-            queryParamsSub.unsubscribe();
+            if (queryParamsSub != null) {
+                queryParamsSub.unsubscribe();
+            }
         });
     }
 
diff --git a/src/popup/vault/add-edit.component.ts b/src/popup/vault/add-edit.component.ts
index cfe17df662..18da71cd3d 100644
--- a/src/popup/vault/add-edit.component.ts
+++ b/src/popup/vault/add-edit.component.ts
@@ -66,7 +66,9 @@ export class AddEditComponent extends BaseAddEditComponent {
                     this.cipher.login.uris[0].uri = params.uri;
                 }
             }
-            queryParamsSub.unsubscribe();
+            if (queryParamsSub != null) {
+                queryParamsSub.unsubscribe();
+            }
         });
 
         window.setTimeout(() => {
diff --git a/src/popup/vault/attachments.component.ts b/src/popup/vault/attachments.component.ts
index b78b84c56e..9faf3c22d1 100644
--- a/src/popup/vault/attachments.component.ts
+++ b/src/popup/vault/attachments.component.ts
@@ -26,7 +26,9 @@ export class AttachmentsComponent extends BaseAttachmentsComponent {
         const queryParamsSub = this.route.queryParams.subscribe(async (params) => {
             this.cipherId = params.cipherId;
             await super.ngOnInit();
-            queryParamsSub.unsubscribe();
+            if (queryParamsSub != null) {
+                queryParamsSub.unsubscribe();
+            }
         });
     }
 
diff --git a/src/popup/vault/ciphers.component.ts b/src/popup/vault/ciphers.component.ts
index ace3c41c30..696b9c74f7 100644
--- a/src/popup/vault/ciphers.component.ts
+++ b/src/popup/vault/ciphers.component.ts
@@ -131,7 +131,9 @@ export class CiphersComponent extends BaseCiphersComponent implements OnInit, On
                 window.setTimeout(() => this.popupUtils.setContentScrollY(window, this.state.scrollY), 0);
             }
             this.stateService.remove(ComponentId);
-            queryParamsSub.unsubscribe();
+            if (queryParamsSub != null) {
+                queryParamsSub.unsubscribe();
+            }
         });
 
         this.broadcasterService.subscribe(ComponentId, (message: any) => {
diff --git a/src/popup/vault/collections.component.ts b/src/popup/vault/collections.component.ts
index ab9764e75c..6b3e22c850 100644
--- a/src/popup/vault/collections.component.ts
+++ b/src/popup/vault/collections.component.ts
@@ -27,7 +27,9 @@ export class CollectionsComponent extends BaseCollectionsComponent {
         const queryParamsSub = this.route.queryParams.subscribe(async (params) => {
             this.cipherId = params.cipherId;
             await super.ngOnInit();
-            queryParamsSub.unsubscribe();
+            if (queryParamsSub != null) {
+                queryParamsSub.unsubscribe();
+            }
         });
     }
 
diff --git a/src/popup/vault/groupings.component.ts b/src/popup/vault/groupings.component.ts
index 776b6b5661..f278a7ed3c 100644
--- a/src/popup/vault/groupings.component.ts
+++ b/src/popup/vault/groupings.component.ts
@@ -132,7 +132,9 @@ export class GroupingsComponent extends BaseGroupingsComponent implements OnInit
             if (!this.syncService.syncInProgress || restoredScopeState) {
                 window.setTimeout(() => this.popupUtils.setContentScrollY(window, this.state.scrollY), 0);
             }
-            queryParamsSub.unsubscribe();
+            if (queryParamsSub != null) {
+                queryParamsSub.unsubscribe();
+            }
         });
     }
 
diff --git a/src/popup/vault/password-history.component.ts b/src/popup/vault/password-history.component.ts
index 4cbe056d58..9b5daf0c8e 100644
--- a/src/popup/vault/password-history.component.ts
+++ b/src/popup/vault/password-history.component.ts
@@ -30,7 +30,9 @@ export class PasswordHistoryComponent extends BasePasswordHistoryComponent {
             }
 
             await super.ngOnInit();
-            queryParamsSub.unsubscribe();
+            if (queryParamsSub != null) {
+                queryParamsSub.unsubscribe();
+            }
         });
     }
 
diff --git a/src/popup/vault/share.component.ts b/src/popup/vault/share.component.ts
index f50164587f..e20db47a4d 100644
--- a/src/popup/vault/share.component.ts
+++ b/src/popup/vault/share.component.ts
@@ -32,7 +32,9 @@ export class ShareComponent extends BaseShareComponent {
         const queryParamsSub = this.route.queryParams.subscribe(async (params) => {
             this.cipherId = params.cipherId;
             await super.ngOnInit();
-            queryParamsSub.unsubscribe();
+            if (queryParamsSub != null) {
+                queryParamsSub.unsubscribe();
+            }
         });
     }
 
diff --git a/src/popup/vault/view.component.ts b/src/popup/vault/view.component.ts
index 84c61ff292..bfad14d6ac 100644
--- a/src/popup/vault/view.component.ts
+++ b/src/popup/vault/view.component.ts
@@ -50,7 +50,9 @@ export class ViewComponent extends BaseViewComponent {
             }
 
             await this.load();
-            queryParamsSub.unsubscribe();
+            if (queryParamsSub != null) {
+                queryParamsSub.unsubscribe();
+            }
         });
         super.ngOnInit();
     }