diff --git a/core/utils.go b/core/utils.go
index e6eabf7..7f84bab 100644
--- a/core/utils.go
+++ b/core/utils.go
@@ -110,12 +110,6 @@ func getPeerFromRules(ctx context.Context, srv *tsnet.Server, rules map[string][
 func peerConnectivityLogic(ctx context.Context, lc *local.Client, relativePeers []netip.Addr, logger *slog.Logger) {
 	for _, peer := range relativePeers {
 		loLog := logger.With("peer", peer)
-		peerInfo, err := lc.WhoIs(ctx, peer.String())
-		if err != nil {
-			loLog.Warn("failed to get peer info", "err", err)
-		} else {
-			loLog = loLog.With("name", peerInfo.Node.ComputedName)
-		}
 
 		ping, err := func() (*ipnstate.PingResult, error) {
 			cnclCtx, cancel := context.WithTimeout(ctx, 5*time.Second)
@@ -134,6 +128,13 @@ func peerConnectivityLogic(ctx context.Context, lc *local.Client, relativePeers
 			continue
 		}
 
+		peerInfo, err := lc.WhoIs(ctx, peer.String())
+		if err != nil {
+			loLog.Warn("failed to get peer info", "err", err)
+		} else {
+			loLog = loLog.With("name", peerInfo.Node.ComputedName)
+		}
+
 		var connect string
 		if ping.DERPRegionCode == "" {
 			connect = "direct"