diff --git a/angular/src/modules/vault-filter/vault-filter.service.ts b/angular/src/modules/vault-filter/vault-filter.service.ts
index eb602e7e..564884c1 100644
--- a/angular/src/modules/vault-filter/vault-filter.service.ts
+++ b/angular/src/modules/vault-filter/vault-filter.service.ts
@@ -64,9 +64,10 @@ export class VaultFilterService {
   }
 
   async buildCollections(vaultFilter: VaultFilter): Promise<DynamicTreeNode<CollectionView>> {
-    const collections = vaultFilter.useAdminCollections
-      ? await this.getAdminCollections(vaultFilter.selectedOrganizationId)
-      : await this.getUserCollections(vaultFilter.selectedOrganizationId);
+    const collections =
+      vaultFilter.useAdminCollections && vaultFilter.selectedOrganizationId != null
+        ? await this.getAdminCollections(vaultFilter.selectedOrganizationId)
+        : await this.getUserCollections(vaultFilter.selectedOrganizationId);
 
     const nestedCollections = await this.collectionService.getAllNested(collections);
     return new DynamicTreeNode<CollectionView>({