diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index bac41d487487..27bcef2f0698 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -1705,7 +1705,7 @@ protected void handleReportForDutyResponse(final RegionServerStartupResponse c)
           if (!isHostnameConsist) {
             String msg = "Master passed us a different hostname to use; was="
               + (StringUtils.isBlank(useThisHostnameInstead)
-                ? rpcServices.getSocketAddress().getHostName()
+                ? expectedHostName
                 : this.useThisHostnameInstead)
               + ", but now=" + hostnameFromMasterPOV;
             LOG.error(msg);