diff --git a/lib/tunnelbroker/tunnelbroker-context.js b/lib/tunnelbroker/tunnelbroker-context.js
--- a/lib/tunnelbroker/tunnelbroker-context.js
+++ b/lib/tunnelbroker/tunnelbroker-context.js
@@ -457,13 +457,13 @@
 
   return (
     <TunnelbrokerContext.Provider value={value}>
-      <PeerToPeerMessageHandler
-        getSessionCounter={getSessionCounter}
-        doesSocketExist={doesSocketExist}
-        socketSend={socketSend}
-      />
       <PeerOlmSessionCreatorProvider>
         <PeerToPeerProvider>{children}</PeerToPeerProvider>
+        <PeerToPeerMessageHandler
+          getSessionCounter={getSessionCounter}
+          doesSocketExist={doesSocketExist}
+          socketSend={socketSend}
+        />
       </PeerOlmSessionCreatorProvider>
       <DMOpsQueueHandler />
     </TunnelbrokerContext.Provider>