diff --git a/wgengine/magicsock/relaymanager.go b/wgengine/magicsock/relaymanager.go
index 81a71b20e..3e72ff0f0 100644
--- a/wgengine/magicsock/relaymanager.go
+++ b/wgengine/magicsock/relaymanager.go
@@ -567,11 +567,12 @@ func (r *relayManager) handleNewServerEndpointRunLoop(newServerEndpoint newRelay
 	// We're ready to start a new handshake.
 	ctx, cancel := context.WithCancel(context.Background())
 	work := &relayHandshakeWork{
-		ep:     newServerEndpoint.ep,
-		se:     newServerEndpoint.se,
-		doneCh: make(chan relayEndpointHandshakeWorkDoneEvent, 1),
-		ctx:    ctx,
-		cancel: cancel,
+		ep:           newServerEndpoint.ep,
+		se:           newServerEndpoint.se,
+		rxDiscoMsgCh: make(chan relayHandshakeDiscoMsgEvent),
+		doneCh:       make(chan relayEndpointHandshakeWorkDoneEvent, 1),
+		ctx:          ctx,
+		cancel:       cancel,
 	}
 	if byServerDisco == nil {
 		byServerDisco = make(map[key.DiscoPublic]*relayHandshakeWork)