diff --git a/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts b/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts
index ef5a8cf289..a675a9e82e 100644
--- a/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts
+++ b/src/app/modules/vault/modules/organization-vault/organization-vault.component.ts
@@ -262,7 +262,7 @@ export class OrganizationVaultComponent implements OnInit, OnDestroy {
 
   async editCipherId(cipherId: string) {
     const cipher = await this.cipherService.get(cipherId);
-    if (cipher.reprompt != 0) {
+    if (cipher != null && cipher.reprompt != 0) {
       if (!(await this.passwordRepromptService.showPasswordPrompt())) {
         this.go({ cipherId: null });
         return;