diff --git a/wgengine/magicsock/magicsock.go b/wgengine/magicsock/magicsock.go
index f1721e1d9..d44cf1c11 100644
--- a/wgengine/magicsock/magicsock.go
+++ b/wgengine/magicsock/magicsock.go
@@ -665,7 +665,10 @@ func (c *Conn) Synchronize() {
 	}
 	sp := syncPoint(make(chan struct{}))
 	c.syncPub.Publish(sp)
-	sp.Wait()
+	select {
+	case <-sp:
+	case <-c.donec:
+	}
 }
 
 // NewConn creates a magic Conn listening on opts.Port.