diff --git a/logic/dns.go b/logic/dns.go
index d1b75c3da..af244c9dd 100644
--- a/logic/dns.go
+++ b/logic/dns.go
@@ -32,7 +32,7 @@ func SetDNS() error {
 			return err
 		}
 		for _, entry := range dns {
-			hostfile.AddHost(entry.Address, entry.Name+"."+entry.Network)
+			hostfile.AddHost(entry.Address, entry.Name)
 		}
 	}
 	if corefilestring == "" {
diff --git a/mq/publishers.go b/mq/publishers.go
index 50f1040fd..83de5e63f 100644
--- a/mq/publishers.go
+++ b/mq/publishers.go
@@ -315,7 +315,7 @@ func PublishDeleteExtClientDNS(client *models.ExtClient) error {
 func PublishCustomDNS(entry *models.DNSEntry) error {
 	dns := models.DNSUpdate{
 		Action: models.DNSInsert,
-		Name:   entry.Name + "." + entry.Network,
+		Name:   entry.Name,
 		//entry.Address6 is never used
 		Address: entry.Address,
 	}