diff --git a/machine.go b/machine.go
index f97169b2..8986ac92 100644
--- a/machine.go
+++ b/machine.go
@@ -86,7 +86,7 @@ func (h *Headscale) getShared(m *Machine) (Machines, error) {
 		Msg("Finding shared peers")
 
 	sharedMachines := []SharedMachine{}
-	if err := h.db.Preload("Namespace").Preload("Machine").Where("namespace_id = ?",
+	if err := h.db.Preload("Namespace").Preload("Machine").Preload("Machine.Namespace").Where("namespace_id = ?",
 		m.NamespaceID).Find(&sharedMachines).Error; err != nil {
 		return Machines{}, err
 	}
@@ -113,7 +113,7 @@ func (h *Headscale) getSharedTo(m *Machine) (Machines, error) {
 		Msg("Finding peers in namespaces this machine is shared with")
 
 	sharedMachines := []SharedMachine{}
-	if err := h.db.Preload("Namespace").Preload("Machine").Where("machine_id = ?",
+	if err := h.db.Preload("Namespace").Preload("Machine").Preload("Machine.Namespace").Where("machine_id = ?",
 		m.ID).Find(&sharedMachines).Error; err != nil {
 		return Machines{}, err
 	}