diff --git a/src/transport/RendezvousSession.cpp b/src/transport/RendezvousSession.cpp index 3dfe330912fa2b..6f5dea11f886a9 100644 --- a/src/transport/RendezvousSession.cpp +++ b/src/transport/RendezvousSession.cpp @@ -179,7 +179,9 @@ void RendezvousSession::OnSessionEstablished() { ChipLogError(Ble, "Missing node id in rendezvous parameters. Node ID is required until opcerts are implemented"); } - mPairingSession.PeerConnection().SetPeerNodeId(mParams.GetRemoteNodeId().ValueOr(kUndefinedNodeId)); + + const auto defaultPeerNodeId = mParams.IsController() ? kTestDeviceNodeId : kTestControllerNodeId; + mPairingSession.PeerConnection().SetPeerNodeId(mParams.GetRemoteNodeId().ValueOr(defaultPeerNodeId)); CHIP_ERROR err = mSecureSessionMgr->NewPairing( Optional::Value(mPairingSession.PeerConnection().GetPeerAddress()),