diff --git a/apps/desktop/src/vault/app/vault/vault-v2.component.ts b/apps/desktop/src/vault/app/vault/vault-v2.component.ts
index 66e77580d1c..6c60aaf0f02 100644
--- a/apps/desktop/src/vault/app/vault/vault-v2.component.ts
+++ b/apps/desktop/src/vault/app/vault/vault-v2.component.ts
@@ -538,6 +538,7 @@ export class VaultV2Component implements OnInit, OnDestroy {
     }
     this.addType = type || this.activeFilter.cipherType;
     this.cipher = new CipherView();
+    this.cipherId = null;
     await this.buildFormConfig("add");
     this.action = "add";
     this.prefillCipherFromFilter();
diff --git a/libs/vault/src/cipher-form/components/cipher-form.component.ts b/libs/vault/src/cipher-form/components/cipher-form.component.ts
index 8b99b60bc16..eebfca65f36 100644
--- a/libs/vault/src/cipher-form/components/cipher-form.component.ts
+++ b/libs/vault/src/cipher-form/components/cipher-form.component.ts
@@ -275,11 +275,6 @@ export class CipherFormComponent implements AfterViewInit, OnInit, OnChanges, Ci
     if (this.updatedCipherView.id === cachedCipher.id) {
       this.updatedCipherView = cachedCipher;
     }
-
-    // `id` is null when a cipher is being added
-    if (this.updatedCipherView.id === null) {
-      this.updatedCipherView = cachedCipher;
-    }
   }
 
   constructor(