diff --git a/client/src/router.tsx b/client/src/router.tsx
index 8ed3403..7bbddd4 100644
--- a/client/src/router.tsx
+++ b/client/src/router.tsx
@@ -79,11 +79,11 @@
           <Route
             path="conversation/:conversationId"
             element={
-              <ConversationProvider>
-                <Messenger>
+              <Messenger>
+                <ConversationProvider>
                   <Outlet />
-                </Messenger>
-              </ConversationProvider>
+                </ConversationProvider>
+              </Messenger>
             }
           >
             <Route index element={<ConversationView />} />