diff --git a/app.go b/app.go
index fcf287f7..34fb77b1 100644
--- a/app.go
+++ b/app.go
@@ -135,7 +135,10 @@ func (h *Headscale) expireEphemeralNodesWorker() {
 				if err != nil {
 					log.Error().Err(err).Str("machine", m.Name).Msg("🤮 Cannot delete ephemeral machine from the database")
 				}
-				h.notifyChangesToPeers(&m)
+				err = h.notifyChangesToPeers(&m)
+				if err != nil {
+					continue
+				}
 			}
 		}
 	}
diff --git a/namespaces.go b/namespaces.go
index ff9eeacc..1bf8c2df 100644
--- a/namespaces.go
+++ b/namespaces.go
@@ -169,7 +169,10 @@ func (h *Headscale) checkForNamespacesPendingUpdates() {
 			continue
 		}
 		for _, m := range *machines {
-			h.notifyChangesToPeers(&m)
+			err = h.notifyChangesToPeers(&m)
+			if err != nil {
+				continue
+			}
 		}
 	}
 	newV, err := h.getValue("namespaces_pending_updates")