diff --git a/vsphere-influxdb.go b/vsphere-influxdb.go
index b1cb6e6..c56b256 100644
--- a/vsphere-influxdb.go
+++ b/vsphere-influxdb.go
@@ -99,7 +99,7 @@ type EntityQuery struct {
 	Metrics []int32
 }
 
-var getversion, debug, test bool
+var getversion, debug, test, RemoveHostDomainName bool
 var stdlog, errlog *log.Logger
 var version = "master"
 
@@ -443,7 +443,11 @@ func (vcenter *VCenter) Query(config Configuration, InfluxDBClient influxclient.
 
 		// Extra tags per host
 		hostSummary[host.Self] = make(map[string]string)
-		hostSummary[host.Self]["name"] = strings.Replace(host.Summary.Config.Name, config.Domain, "", -1)
+		hostSummary[host.Self]["name"] = hostSummary[host.Self]["name"] = host.Summary.Config.Name
+		// Remove Domain Name from Host
+		if RemoveHostDomainName {
+			hostSummary[host.Self]["name"] = strings.Replace(host.Summary.Config.Name, config.Domain, "", -1)
+		}
 		hostSummary[host.Self]["cluster"] = hostToCluster[host.Self]
 
 		// Extra metrics per host