diff --git a/api.go b/api.go
index e360187c..dd762a07 100644
--- a/api.go
+++ b/api.go
@@ -260,16 +260,9 @@ func (h *Headscale) getMapResponse(mKey wgkey.Key, req tailcfg.MapRequest, m *Ma
 
 	var dnsConfig *tailcfg.DNSConfig
 	if h.cfg.DNSConfig != nil && h.cfg.DNSConfig.Proxied { // if MagicDNS is enabled
-		// TODO(juanfont): We should not be regenerating this all the time
-		// And we should only send the domains of the peers (this own namespace + those from the shared peers)
-		namespaces, err := h.ListNamespaces()
-		if err != nil {
-			return nil, err
-		}
+		// Only inject the Search Domain of the current namespace - shared nodes should use their full FQDN
 		dnsConfig = h.cfg.DNSConfig.Clone()
-		for _, ns := range *namespaces {
-			dnsConfig.Domains = append(dnsConfig.Domains, fmt.Sprintf("%s.%s", ns.Name, h.cfg.BaseDomain))
-		}
+		dnsConfig.Domains = append(dnsConfig.Domains, fmt.Sprintf("%s.%s", m.Namespace.Name, h.cfg.BaseDomain))
 	} else {
 		dnsConfig = h.cfg.DNSConfig
 	}
diff --git a/dns.go b/dns.go
index c53849c9..d8f587f5 100644
--- a/dns.go
+++ b/dns.go
@@ -15,7 +15,7 @@ func generateMagicDNSRootDomains(ipPrefix netaddr.IPPrefix, baseDomain string) (
 	}
 
 	// TODO(juanfont): we are not handing out IPv6 addresses yet
-	// and in fact this is Tailscale.com's range (not the fd7a:115c:a1e0: range in the fc00::/7 network)
+	// and in fact this is Tailscale.com's range (note the fd7a:115c:a1e0: range in the fc00::/7 network)
 	ipv6base := dnsname.FQDN("0.e.1.a.c.5.1.1.a.7.d.f.ip6.arpa.")
 	fqdns := []dnsname.FQDN{base, ipv6base}
 
diff --git a/machine.go b/machine.go
index 0ea97d91..688dc783 100644
--- a/machine.go
+++ b/machine.go
@@ -63,7 +63,7 @@ func (h *Headscale) getDirectPeers(m *Machine) (Machines, error) {
 		Msg("Finding direct peers")
 
 	machines := Machines{}
-	if err := h.db.Where("namespace_id = ? AND machine_key <> ? AND registered",
+	if err := h.db.Preload("Namespace").Where("namespace_id = ? AND machine_key <> ? AND registered",
 		m.NamespaceID, m.MachineKey).Find(&machines).Error; err != nil {
 		log.Error().Err(err).Msg("Error accessing db")
 		return nil, err