diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
index f07db622cd6..cd78d3d17f4 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
@@ -271,6 +271,8 @@ public class SCMDatanodeProtocolServer implements
         .setErrorCode(cmd.getError())
         .setClusterID(cmd.getClusterID())
         .setDatanodeUUID(cmd.getDatanodeUUID())
+        .setIpAddress(cmd.getIpAddress())
+        .setHostname(cmd.getHostName())
         .build();
   }