diff --git a/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java b/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java
index b041457b30b..fb3844f23bd 100644
--- a/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java
+++ b/metadata/src/main/java/org/apache/kafka/controller/ClusterControlManager.java
@@ -252,7 +252,7 @@ public class ClusterControlManager {
         List<ApiMessageAndVersion> records = new ArrayList<>();
         records.add(new ApiMessageAndVersion(record,
             REGISTER_BROKER_RECORD.highestSupportedVersion()));
-        return ControllerResult.of(records, new BrokerRegistrationReply(brokerEpoch));
+        return ControllerResult.atomicOf(records, new BrokerRegistrationReply(brokerEpoch));
     }
 
     public void replay(RegisterBrokerRecord record) {