diff --git a/main.go b/main.go
index 5eee5e99..b3232f51 100644
--- a/main.go
+++ b/main.go
@@ -46,11 +46,7 @@ func initialize() { // Client Mode Prereq Check
 	}
 
 	if servercfg.GetNodeID() == "" {
-		id, err := os.Hostname()
-		if err != nil {
-			id = ncutils.MakeRandomString(10)
-		}
-		servercfg.SetNodeID(id)
+		logger.FatalLog("error: must set NODE_ID, currently blank")
 	}
 
 	if err = database.InitializeDatabase(); err != nil {
diff --git a/servercfg/serverconf.go b/servercfg/serverconf.go
index 66ee8fb4..e169aa17 100644
--- a/servercfg/serverconf.go
+++ b/servercfg/serverconf.go
@@ -540,11 +540,17 @@ func IsHostNetwork() bool {
 // GetNodeID - gets the node id
 func GetNodeID() string {
 	var id string
+	var err error
 	// id = getMacAddr()
 	if os.Getenv("NODE_ID") != "" {
 		id = os.Getenv("NODE_ID")
 	} else if config.Config.Server.NodeID != "" {
 		id = config.Config.Server.NodeID
+	} else {
+		id, err = os.Hostname()
+		if err != nil {
+			return ""
+		}
 	}
 	return id
 }