diff --git a/src/transport/SessionManager.cpp b/src/transport/SessionManager.cpp index 82287339117182..d68a5f3e6e6480 100644 --- a/src/transport/SessionManager.cpp +++ b/src/transport/SessionManager.cpp @@ -332,6 +332,10 @@ CHIP_ERROR SessionManager::PrepareMessage(const SessionHandle & sessionHandle, P #if CHIP_PROGRESS_LOGGING destination = kUndefinedNodeId; fabricIndex = kUndefinedFabricIndex; + if (session->GetSessionRole() == Transport::UnauthenticatedSession::SessionRole::kResponder) + { + destination = session->GetEphemeralInitiatorNodeID(); + } #endif // CHIP_PROGRESS_LOGGING } break;