diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go
index a82e710b2..719fbadec 100644
--- a/wgengine/magicsock/magicsock.go
+++ b/wgengine/magicsock/magicsock.go
@@ -1389,10 +1389,10 @@ func (c *Conn) handleDiscoMessage(msg []byte, src netip.AddrPort, derpNodeSrc ke
 		return
 	}
 
-	if !c.peerMap.anyEndpointForDiscoKey(sender) {
+	if !c.peerMap.knownPeerDiscoKey(sender) {
 		metricRecvDiscoBadPeer.Add(1)
 		if debugDisco() {
-			c.logf("magicsock: disco: ignoring disco-looking frame, don't know endpoint for %v", sender.ShortString())
+			c.logf("magicsock: disco: ignoring disco-looking frame, don't know of key %v", sender.ShortString())
 		}
 		return
 	}
@@ -2050,7 +2050,7 @@ func (c *Conn) SetNetworkMap(nm *netmap.NetworkMap) {
 
 	// discokeys might have changed in the above. Discard unused info.
 	for dk := range c.discoInfo {
-		if !c.peerMap.anyEndpointForDiscoKey(dk) {
+		if !c.peerMap.knownPeerDiscoKey(dk) {
 			delete(c.discoInfo, dk)
 		}
 	}
diff --git a/wgengine/magicsock/peermap.go b/wgengine/magicsock/peermap.go
index cacba5728..e1c7db1f6 100644
--- a/wgengine/magicsock/peermap.go
+++ b/wgengine/magicsock/peermap.go
@@ -60,10 +60,11 @@ func (m *peerMap) nodeCount() int {
 	return len(m.byNodeKey)
 }
 
-// anyEndpointForDiscoKey reports whether there exists any
-// peers in the netmap with dk as their DiscoKey.
-func (m *peerMap) anyEndpointForDiscoKey(dk key.DiscoPublic) bool {
-	return len(m.nodesOfDisco[dk]) > 0
+// knownPeerDiscoKey reports whether there exists any peer with the disco key
+// dk.
+func (m *peerMap) knownPeerDiscoKey(dk key.DiscoPublic) bool {
+	_, ok := m.nodesOfDisco[dk]
+	return ok
 }
 
 // endpointForNodeKey returns the endpoint for nk, or nil if