diff --git a/command/server/config.go b/command/server/config.go
index d58a11fe10..571d4fc59d 100644
--- a/command/server/config.go
+++ b/command/server/config.go
@@ -212,6 +212,11 @@ func (c *Config) Merge(c2 *Config) *Config {
 		result.DefaultLeaseTTL = c2.DefaultLeaseTTL
 	}
 
+	result.ClusterName = c.ClusterName
+	if c2.ClusterName != "" {
+		result.ClusterName = c2.ClusterName
+	}
+
 	return result
 }