diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go
index 94df5ef60..b1a11110a 100644
--- a/wgengine/magicsock/magicsock.go
+++ b/wgengine/magicsock/magicsock.go
@@ -1258,8 +1258,8 @@ func (c *Conn) CreateEndpoint(key [32]byte, addrs string) (conn.Endpoint, error)
 		copy(epAddr.ip.Addr[:], addr.IP.To16())
 		epAddr.port = uint16(addr.Port)
 		c.addrsByUDP[epAddr] = a
-		c.addrsByKey[key] = a
 	}
+	c.addrsByKey[key] = a
 	c.addrsMu.Unlock()
 
 	return a, nil