diff --git a/rpc/grpc/server/src/connection_handler.rs b/rpc/grpc/server/src/connection_handler.rs
index 020d57725..f8fe1de71 100644
--- a/rpc/grpc/server/src/connection_handler.rs
+++ b/rpc/grpc/server/src/connection_handler.rs
@@ -99,7 +99,7 @@ impl ConnectionHandler {
         let converter = Arc::new(GrpcServiceConverter::new());
         let collector = Arc::new(GrpcServiceCollector::new(GRPC_SERVER, core_channel.receiver(), converter));
         let subscriber = Arc::new(Subscriber::new(GRPC_SERVER, core_events, core_notifier, core_listener_id));
-        let policies = MutationPolicies::new(UtxosChangedMutationPolicy::AllOrNothing);
+        let policies = MutationPolicies::new(UtxosChangedMutationPolicy::AddressSet);
         let notifier: Arc<Notifier<Notification, Connection>> = Arc::new(Notifier::new(
             GRPC_SERVER,
             core_events,
diff --git a/rpc/service/src/service.rs b/rpc/service/src/service.rs
index 8ae80c6fb..ffffd2d0c 100644
--- a/rpc/service/src/service.rs
+++ b/rpc/service/src/service.rs
@@ -178,7 +178,7 @@ impl RpcCoreService {
         let protocol_converter = Arc::new(ProtocolConverter::new(flow_context.clone()));
 
         // Create the rcp-core notifier
-        let policies = MutationPolicies::new(UtxosChangedMutationPolicy::AllOrNothing);
+        let policies = MutationPolicies::new(UtxosChangedMutationPolicy::AddressSet);
         let notifier =
             Arc::new(Notifier::new(RPC_CORE, EVENT_TYPE_ARRAY[..].into(), collectors, subscribers, subscription_context, 1, policies));
 
diff --git a/rpc/wrpc/server/src/server.rs b/rpc/wrpc/server/src/server.rs
index e49ed5ecc..9deebcd2d 100644
--- a/rpc/wrpc/server/src/server.rs
+++ b/rpc/wrpc/server/src/server.rs
@@ -74,7 +74,7 @@ impl Server {
             let converter = Arc::new(WrpcServiceConverter::new());
             let collector = Arc::new(WrpcServiceCollector::new(WRPC_SERVER, notification_channel.receiver(), converter));
             let subscriber = Arc::new(Subscriber::new(WRPC_SERVER, enabled_events, service.notifier(), listener_id));
-            let policies = MutationPolicies::new(UtxosChangedMutationPolicy::AllOrNothing);
+            let policies = MutationPolicies::new(UtxosChangedMutationPolicy::AddressSet);
             let wrpc_notifier = Arc::new(Notifier::new(
                 WRPC_SERVER,
                 enabled_events,