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/app/accounts/login.component.ts b/src/app/accounts/login.component.ts
index bf7f5893d7..eb13bab842 100644
--- a/src/app/accounts/login.component.ts
+++ b/src/app/accounts/login.component.ts
@@ -37,7 +37,9 @@ export class LoginComponent extends BaseLoginComponent {
                     { route: '/settings/create-organization', qParams: { plan: qParams.org } });
             }
             await super.ngOnInit();
-            queryParamsSub.unsubscribe();
+            if (queryParamsSub != null) {
+                queryParamsSub.unsubscribe();
+            }
         });
     }
 
diff --git a/src/app/accounts/register.component.ts b/src/app/accounts/register.component.ts
index ca97fc20d1..407777b3ed 100644
--- a/src/app/accounts/register.component.ts
+++ b/src/app/accounts/register.component.ts
@@ -44,7 +44,9 @@ export class RegisterComponent extends BaseRegisterComponent {
                 this.stateService.save('loginRedirect',
                     { route: '/settings/create-organization', qParams: { plan: qParams.org } });
             }
-            queryParamsSub.unsubscribe();
+            if (queryParamsSub != null) {
+                queryParamsSub.unsubscribe();
+            }
         });
     }
 }
diff --git a/src/app/organizations/manage/collections.component.ts b/src/app/organizations/manage/collections.component.ts
index f7304d1796..13380de321 100644
--- a/src/app/organizations/manage/collections.component.ts
+++ b/src/app/organizations/manage/collections.component.ts
@@ -56,7 +56,9 @@ export class CollectionsComponent implements OnInit {
             await this.load();
             const queryParamsSub = this.route.queryParams.subscribe(async (qParams) => {
                 this.searchText = qParams.search;
-                queryParamsSub.unsubscribe();
+                if (queryParamsSub != null) {
+                    queryParamsSub.unsubscribe();
+                }
             });
         });
     }
diff --git a/src/app/organizations/manage/groups.component.ts b/src/app/organizations/manage/groups.component.ts
index 62e058f286..a2a77e9a07 100644
--- a/src/app/organizations/manage/groups.component.ts
+++ b/src/app/organizations/manage/groups.component.ts
@@ -58,7 +58,9 @@ export class GroupsComponent implements OnInit {
             await this.load();
             const queryParamsSub = this.route.queryParams.subscribe(async (qParams) => {
                 this.searchText = qParams.search;
-                queryParamsSub.unsubscribe();
+                if (queryParamsSub != null) {
+                    queryParamsSub.unsubscribe();
+                }
             });
         });
     }
diff --git a/src/app/organizations/manage/people.component.ts b/src/app/organizations/manage/people.component.ts
index 83f3ec4150..949e8f4410 100644
--- a/src/app/organizations/manage/people.component.ts
+++ b/src/app/organizations/manage/people.component.ts
@@ -89,7 +89,9 @@ export class PeopleComponent implements OnInit {
                         this.events(user[0]);
                     }
                 }
-                queryParamsSub.unsubscribe();
+                if (queryParamsSub != null) {
+                    queryParamsSub.unsubscribe();
+                }
             });
         });
     }
diff --git a/src/app/organizations/vault/vault.component.ts b/src/app/organizations/vault/vault.component.ts
index 0a543966fb..228d792406 100644
--- a/src/app/organizations/vault/vault.component.ts
+++ b/src/app/organizations/vault/vault.component.ts
@@ -112,7 +112,9 @@ export class VaultComponent implements OnInit, OnDestroy {
                     }
                 }
 
-                queryParamsSub.unsubscribe();
+                if (queryParamsSub != null) {
+                    queryParamsSub.unsubscribe();
+                }
             });
         });
     }
diff --git a/src/app/settings/create-organization.component.ts b/src/app/settings/create-organization.component.ts
index 5f7f486cb6..f16eb908c9 100644
--- a/src/app/settings/create-organization.component.ts
+++ b/src/app/settings/create-organization.component.ts
@@ -96,7 +96,9 @@ export class CreateOrganizationComponent implements OnInit {
             if (qParams.plan === 'families' || qParams.plan === 'teams' || qParams.plan === 'enterprise') {
                 this.plan = qParams.plan;
             }
-            queryParamsSub.unsubscribe();
+            if (queryParamsSub != null) {
+                queryParamsSub.unsubscribe();
+            }
         });
     }
 
diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts
index 936702e9c4..79e59af221 100644
--- a/src/app/vault/vault.component.ts
+++ b/src/app/vault/vault.component.ts
@@ -141,7 +141,9 @@ export class VaultComponent implements OnInit, OnDestroy {
                 });
             });
 
-            queryParamsSub.unsubscribe();
+            if (queryParamsSub != null) {
+                queryParamsSub.unsubscribe();
+            }
         });
     }