From 42255b6bd636c4b2e77394003d5084546c64bcdd Mon Sep 17 00:00:00 2001
From: Ryan Fowler <ryan.fowler@r3.com>
Date: Mon, 17 Mar 2025 10:39:45 +0000
Subject: [PATCH] Merge fixup

---
 node/src/main/kotlin/net/corda/node/internal/Node.kt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/node/src/main/kotlin/net/corda/node/internal/Node.kt b/node/src/main/kotlin/net/corda/node/internal/Node.kt
index 5558bade94..2ad1b19b0a 100644
--- a/node/src/main/kotlin/net/corda/node/internal/Node.kt
+++ b/node/src/main/kotlin/net/corda/node/internal/Node.kt
@@ -327,6 +327,8 @@ open class Node(configuration: NodeConfiguration,
                 advertisedAddress = nodeInfo.addresses[0],
                 maxMessageSize = networkParameters.maxMessageSize
         )
+
+        if (rpcBroker == null) rpcBroker = messageBroker
     }
 
     private fun makeBridgeControlListener(serverAddress: NetworkHostAndPort, networkParameters: NetworkParameters): BridgeControlListener {