diff --git a/jslib b/jslib
index 4927d0d907..d0ad865060 160000
--- a/jslib
+++ b/jslib
@@ -1 +1 @@
-Subproject commit 4927d0d9077964ec1f047667ec3a2132af594527
+Subproject commit d0ad8650605ec506704ed76f13f40fd4d33cffcd
diff --git a/src/app/organizations/vault/vault.component.ts b/src/app/organizations/vault/vault.component.ts
index a6593e4f15..7d28f1c04d 100644
--- a/src/app/organizations/vault/vault.component.ts
+++ b/src/app/organizations/vault/vault.component.ts
@@ -152,7 +152,7 @@ export class VaultComponent implements OnInit, OnDestroy {
             if (collectionId === 'unassigned') {
                 return c.collectionIds == null || c.collectionIds.length === 0;
             } else {
-                return c.collectionIds.indexOf(collectionId) > -1;
+                return c.collectionIds != null && c.collectionIds.indexOf(collectionId) > -1;
             }
         };
         if (load) {
diff --git a/src/app/vault/collections.component.ts b/src/app/vault/collections.component.ts
index fea8e6d98b..741614d506 100644
--- a/src/app/vault/collections.component.ts
+++ b/src/app/vault/collections.component.ts
@@ -47,7 +47,7 @@ export class CollectionsComponent implements OnInit, OnDestroy {
         this.selectAll(false);
         if (this.collectionIds != null) {
             this.collections.forEach((c) => {
-                (c as any).checked = this.collectionIds.indexOf(c.id) > -1;
+                (c as any).checked = this.collectionIds != null && this.collectionIds.indexOf(c.id) > -1;
             });
         }
     }
diff --git a/src/app/vault/vault.component.ts b/src/app/vault/vault.component.ts
index 3b05bfead6..741b120e41 100644
--- a/src/app/vault/vault.component.ts
+++ b/src/app/vault/vault.component.ts
@@ -189,7 +189,7 @@ export class VaultComponent implements OnInit, OnDestroy {
     async filterCollection(collectionId: string) {
         this.ciphersComponent.showAddNew = false;
         this.groupingsComponent.searchPlaceholder = this.i18nService.t('searchCollection');
-        await this.ciphersComponent.load((c) => c.collectionIds.indexOf(collectionId) > -1);
+        await this.ciphersComponent.load((c) => c.collectionIds != null && c.collectionIds.indexOf(collectionId) > -1);
         this.clearFilters();
         this.collectionId = collectionId;
         this.go();