diff --git a/cmd/globals.go b/cmd/globals.go
index fff57c512..d3b0d002f 100644
--- a/cmd/globals.go
+++ b/cmd/globals.go
@@ -232,7 +232,7 @@ var (
 	// The name of this local node, fetched from arguments
 	globalLocalNodeName    string
 	globalLocalNodeNameHex string
-	globalNodeNamesHex     map[string]struct{}
+	globalNodeNamesHex     = make(map[string]struct{})
 
 	// The global subnet config
 	globalSubnetConfig subnet.Config
diff --git a/cmd/server-main.go b/cmd/server-main.go
index b8fdd0c73..39aadde32 100644
--- a/cmd/server-main.go
+++ b/cmd/server-main.go
@@ -251,15 +251,6 @@ func serverHandleCmdArgs(ctx *cli.Context) {
 	globalLocalNodeName = GetLocalPeer(globalEndpoints, globalMinioHost, globalMinioPort)
 	nodeNameSum := sha256.Sum256([]byte(globalLocalNodeName))
 	globalLocalNodeNameHex = hex.EncodeToString(nodeNameSum[:])
-	globalNodeNamesHex = make(map[string]struct{})
-	for _, n := range globalNodes {
-		nodeName := n.Host
-		if n.IsLocal {
-			nodeName = globalLocalNodeName
-		}
-		nodeNameSum := sha256.Sum256([]byte(nodeName))
-		globalNodeNamesHex[hex.EncodeToString(nodeNameSum[:])] = struct{}{}
-	}
 
 	// allow transport to be HTTP/1.1 for proxying.
 	globalProxyTransport = NewCustomHTTPProxyTransport()()
@@ -641,6 +632,15 @@ func serverMain(ctx *cli.Context) {
 	xhttp.SetDeploymentID(globalDeploymentID)
 	xhttp.SetMinIOVersion(Version)
 
+	for _, n := range globalNodes {
+		nodeName := n.Host
+		if n.IsLocal {
+			nodeName = globalLocalNodeName
+		}
+		nodeNameSum := sha256.Sum256([]byte(nodeName + globalDeploymentID))
+		globalNodeNamesHex[hex.EncodeToString(nodeNameSum[:])] = struct{}{}
+	}
+
 	bootstrapTrace("newSharedLock")
 	globalLeaderLock = newSharedLock(GlobalContext, newObject, "leader.lock")