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
@@ -458,12 +458,14 @@
   return (
     <TunnelbrokerContext.Provider value={value}>
       <PeerOlmSessionCreatorProvider>
-        <PeerToPeerProvider>{children}</PeerToPeerProvider>
-        <PeerToPeerMessageHandler
-          getSessionCounter={getSessionCounter}
-          doesSocketExist={doesSocketExist}
-          socketSend={socketSend}
-        />
+        <PeerToPeerProvider>
+          <PeerToPeerMessageHandler
+            getSessionCounter={getSessionCounter}
+            doesSocketExist={doesSocketExist}
+            socketSend={socketSend}
+          />
+          {children}
+        </PeerToPeerProvider>
       </PeerOlmSessionCreatorProvider>
       <DMOpsQueueHandler />
     </TunnelbrokerContext.Provider>