diff --git a/apps/browser/src/tools/popup/services/browser-send-state.service.ts b/apps/browser/src/tools/popup/services/browser-send-state.service.ts
index 52aeb01a92..11e71c9b20 100644
--- a/apps/browser/src/tools/popup/services/browser-send-state.service.ts
+++ b/apps/browser/src/tools/popup/services/browser-send-state.service.ts
@@ -46,7 +46,9 @@ export class BrowserSendStateService {
    *  the send component on the browser
    */
   async setBrowserSendComponentState(value: BrowserSendComponentState): Promise<void> {
-    await this.activeUserBrowserSendComponentState.update(() => value);
+    await this.activeUserBrowserSendComponentState.update(() => value, {
+      shouldUpdate: (current) => !(current == null && value == null),
+    });
   }
 
   /** Get the active user's browser component state
@@ -60,6 +62,8 @@ export class BrowserSendStateService {
    *  @param { BrowserComponentState } value set the scroll position and search text for the send component on the browser
    */
   async setBrowserSendTypeComponentState(value: BrowserComponentState): Promise<void> {
-    await this.activeUserBrowserSendTypeComponentState.update(() => value);
+    await this.activeUserBrowserSendTypeComponentState.update(() => value, {
+      shouldUpdate: (current) => !(current == null && value == null),
+    });
   }
 }
diff --git a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts
index 4d2674fd70..d882dfd525 100644
--- a/apps/browser/src/vault/popup/components/vault/current-tab.component.ts
+++ b/apps/browser/src/vault/popup/components/vault/current-tab.component.ts
@@ -292,6 +292,8 @@ export class CurrentTabComponent implements OnInit, OnDestroy {
     const ciphers = await this.cipherService.getAllDecryptedForUrl(
       this.url,
       otherTypes.length > 0 ? otherTypes : null,
+      null,
+      false,
     );
 
     this.loginCiphers = [];
diff --git a/apps/browser/src/vault/services/vault-browser-state.service.ts b/apps/browser/src/vault/services/vault-browser-state.service.ts
index a0d55a9d55..43a28928da 100644
--- a/apps/browser/src/vault/services/vault-browser-state.service.ts
+++ b/apps/browser/src/vault/services/vault-browser-state.service.ts
@@ -52,7 +52,9 @@ export class VaultBrowserStateService {
   }
 
   async setBrowserGroupingsComponentState(value: BrowserGroupingsComponentState): Promise<void> {
-    await this.activeUserVaultBrowserGroupingsComponentState.update(() => value);
+    await this.activeUserVaultBrowserGroupingsComponentState.update(() => value, {
+      shouldUpdate: (current) => !(current == null && value == null),
+    });
   }
 
   async getBrowserVaultItemsComponentState(): Promise<BrowserComponentState> {
@@ -60,6 +62,8 @@ export class VaultBrowserStateService {
   }
 
   async setBrowserVaultItemsComponentState(value: BrowserComponentState): Promise<void> {
-    await this.activeUserVaultBrowserComponentState.update(() => value);
+    await this.activeUserVaultBrowserComponentState.update(() => value, {
+      shouldUpdate: (current) => !(current == null && value == null),
+    });
   }
 }
diff --git a/libs/common/src/vault/abstractions/cipher.service.ts b/libs/common/src/vault/abstractions/cipher.service.ts
index 22e2c54a59..4337043cdf 100644
--- a/libs/common/src/vault/abstractions/cipher.service.ts
+++ b/libs/common/src/vault/abstractions/cipher.service.ts
@@ -33,6 +33,7 @@ export abstract class CipherService {
     url: string,
     includeOtherTypes?: CipherType[],
     defaultMatch?: UriMatchStrategySetting,
+    reindexCiphers?: boolean,
   ) => Promise<CipherView[]>;
   getAllFromApiForOrganization: (organizationId: string) => Promise<CipherView[]>;
   /**
diff --git a/libs/common/src/vault/services/cipher.service.ts b/libs/common/src/vault/services/cipher.service.ts
index 0b44636ea6..fd484ee902 100644
--- a/libs/common/src/vault/services/cipher.service.ts
+++ b/libs/common/src/vault/services/cipher.service.ts
@@ -441,6 +441,7 @@ export class CipherService implements CipherServiceAbstraction {
     url: string,
     includeOtherTypes?: CipherType[],
     defaultMatch: UriMatchStrategySetting = null,
+    reindexCiphers = true,
   ): Promise<CipherView[]> {
     if (url == null && includeOtherTypes == null) {
       return Promise.resolve([]);
@@ -449,7 +450,9 @@ export class CipherService implements CipherServiceAbstraction {
     const equivalentDomains = await firstValueFrom(
       this.domainSettingsService.getUrlEquivalentDomains(url),
     );
-    const ciphers = await this.getAllDecrypted();
+    const ciphers = reindexCiphers
+      ? await this.getAllDecrypted()
+      : await this.getDecryptedCiphers();
     defaultMatch ??= await firstValueFrom(this.domainSettingsService.defaultUriMatchStrategy$);
 
     return ciphers.filter((cipher) => {
@@ -1135,7 +1138,9 @@ export class CipherService implements CipherServiceAbstraction {
   }
 
   async setAddEditCipherInfo(value: AddEditCipherInfo) {
-    await this.addEditCipherInfoState.update(() => value);
+    await this.addEditCipherInfoState.update(() => value, {
+      shouldUpdate: (current) => !(current == null && value == null),
+    });
   }
 
   // Helpers