diff --git a/pkg/cmd/server/config.go b/pkg/cmd/server/config.go
index 027cbcca0d07..9399386f27a4 100644
--- a/pkg/cmd/server/config.go
+++ b/pkg/cmd/server/config.go
@@ -233,9 +233,6 @@ func (cfg Config) GetNodeList() []string {
 		nodeList = append(nodeList, curr)
 	}
 
-	if len(nodeList) == 1 && nodeList[0] == "127.0.0.1" {
-		nodeList[0] = cfg.Hostname
-	}
 	for i, s := range nodeList {
 		s = strings.ToLower(s)
 		nodeList[i] = s
diff --git a/pkg/cmd/server/start.go b/pkg/cmd/server/start.go
index 917ba58a6677..1184d4843e06 100644
--- a/pkg/cmd/server/start.go
+++ b/pkg/cmd/server/start.go
@@ -118,12 +118,20 @@ func (cfg Config) Start(args []string) error {
 		if cfg.MasterPublicAddr.Provided {
 			glog.Infof("OpenShift master public address is %s", cfg.MasterPublicAddr.String())
 		}
+		if len(cfg.NodeList) == 1 && cfg.NodeList[0] == "127.0.0.1" {
+			cfg.NodeList[0] = cfg.Hostname
+		}
 
 	case cfg.StartMaster:
 		glog.Infof("Starting an OpenShift master, reachable at %s (etcd: %s)", cfg.MasterAddr.String(), cfg.EtcdAddr.String())
 		if cfg.MasterPublicAddr.Provided {
 			glog.Infof("OpenShift master public address is %s", cfg.MasterPublicAddr.String())
 		}
+		// TODO: refactor the start command to have master and node subcommands.
+		// Then make sure the default NodeList doesn't pollute the master command.
+		if len(cfg.NodeList) == 1 && cfg.NodeList[0] == "127.0.0.1" {
+			cfg.NodeList = []string{}
+		}
 
 	case cfg.StartNode:
 		glog.Infof("Starting an OpenShift node, connecting to %s", cfg.MasterAddr.String())