diff --git a/apps/web/src/app/vault/vault.component.ts b/apps/web/src/app/vault/vault.component.ts
index ca0d93cf4c0..e6764c14bef 100644
--- a/apps/web/src/app/vault/vault.component.ts
+++ b/apps/web/src/app/vault/vault.component.ts
@@ -131,12 +131,7 @@ export class VaultComponent implements OnInit, OnDestroy {
             await this.editCipher(cipherView);
           }
         }),
-        takeUntil(this.destroy$)
-      )
-      .subscribe();
-
-    this.route.queryParams
-      .pipe(
+        switchMap(() => this.route.queryParams),
         switchMap(async (params) => {
           const cipherId = getCipherIdFromParams(params);
           if (cipherId) {