diff --git a/libs/angular/src/vault/components/vault-items.component.ts b/libs/angular/src/vault/components/vault-items.component.ts index 0254ddabf2b..563fd48028d 100644 --- a/libs/angular/src/vault/components/vault-items.component.ts +++ b/libs/angular/src/vault/components/vault-items.component.ts @@ -194,7 +194,12 @@ export class VaultItemsComponent implements OnDestroy return this.searchService.searchCiphers( userId, searchText, - [filter, this.deletedFilter, this.archivedFilter, restrictedTypeFilter], + [ + filter, + this.deletedFilter, + ...(this.deleted ? [] : [this.archivedFilter]), + restrictedTypeFilter, + ], allCiphers, ); }), diff --git a/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts b/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts index 87536036644..83693c85239 100644 --- a/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts +++ b/libs/angular/src/vault/vault-filter/models/vault-filter.model.ts @@ -51,7 +51,8 @@ export class VaultFilter { cipherPassesFilter = CipherViewLikeUtils.isDeleted(cipher); } if (this.status === "archive" && cipherPassesFilter) { - cipherPassesFilter = CipherViewLikeUtils.isArchived(cipher); + cipherPassesFilter = + CipherViewLikeUtils.isArchived(cipher) && !CipherViewLikeUtils.isDeleted(cipher); } if (this.cipherType != null && cipherPassesFilter) { cipherPassesFilter = CipherViewLikeUtils.getType(cipher) === this.cipherType;