diff --git a/libs/common/src/auth/services/key-connector.service.ts b/libs/common/src/auth/services/key-connector.service.ts
index f6f76579ee5..83f7197f4b3 100644
--- a/libs/common/src/auth/services/key-connector.service.ts
+++ b/libs/common/src/auth/services/key-connector.service.ts
@@ -76,7 +76,11 @@ export class KeyConnectorService implements KeyConnectorServiceAbstraction {
   }
 
   async setUsesKeyConnector(usesKeyConnector: boolean, userId: UserId) {
-    await this.stateProvider.getUser(userId, USES_KEY_CONNECTOR).update(() => usesKeyConnector);
+    await this.stateProvider.getUser(userId, USES_KEY_CONNECTOR).update(() => usesKeyConnector, {
+      shouldUpdate: (previous) => {
+        return previous === usesKeyConnector;
+      },
+    });
   }
 
   getUsesKeyConnector(userId: UserId): Promise<boolean> {
diff --git a/libs/common/src/autofill/services/domain-settings.service.ts b/libs/common/src/autofill/services/domain-settings.service.ts
index b2833b9ee25..ffeaaf9f9fd 100644
--- a/libs/common/src/autofill/services/domain-settings.service.ts
+++ b/libs/common/src/autofill/services/domain-settings.service.ts
@@ -155,7 +155,15 @@ export class DefaultDomainSettingsService implements DomainSettingsService {
   }
 
   async setEquivalentDomains(newValue: EquivalentDomains, userId: UserId): Promise<void> {
-    await this.stateProvider.getUser(userId, EQUIVALENT_DOMAINS).update(() => newValue);
+    await this.stateProvider.getUser(userId, EQUIVALENT_DOMAINS).update(() => newValue, {
+      shouldUpdate: (previous) => {
+        if (newValue.length === 0 && previous.length === 0) {
+          return false;
+        } else {
+          return true;
+        }
+      },
+    });
   }
 
   async setDefaultUriMatchStrategy(newValue: UriMatchStrategySetting): Promise<void> {