diff --git a/pkg/goldpinger/config.go b/pkg/goldpinger/config.go
index dba0dfb..b71da60 100644
--- a/pkg/goldpinger/config.go
+++ b/pkg/goldpinger/config.go
@@ -32,6 +32,7 @@ var GoldpingerConfig = struct {
 	UseHostIP        bool    `long:"use-host-ip" description:"When making the calls, use host ip (defaults to pod ip)" env:"USE_HOST_IP"`
 	LabelSelector    string  `long:"label-selector" description:"label selector to use to discover goldpinger pods in the cluster" env:"LABEL_SELECTOR" default:"app=goldpinger"`
 	Namespace        *string `long:"namespace" description:"namespace to use to discover goldpinger pods in the cluster (empty for all). Defaults to discovering the namespace for the current pod" env:"NAMESPACE"`
+	DisplayNodeName  bool    `long:"display-nodename" description:"Display nodename other than podname in UI (defaults is podname)." env:"DISPLAY_NODENAME"`
 	KubernetesClient *kubernetes.Clientset
 
 	DnsHosts []string `long:"host-to-resolve" description:"A host to attempt dns resolve on (space delimited)" env:"HOSTS_TO_RESOLVE" env-delim:" "`
diff --git a/pkg/goldpinger/k8s.go b/pkg/goldpinger/k8s.go
index 33f340f..7b323be 100644
--- a/pkg/goldpinger/k8s.go
+++ b/pkg/goldpinger/k8s.go
@@ -95,7 +95,7 @@ func getPodIP(p v1.Pod) string {
 }
 
 func getPodNodeName(p v1.Pod) string {
-	if p.Spec.NodeName != "" {
+	if GoldpingerConfig.DisplayNodeName {
 		return p.Spec.NodeName
 	}