diff --git a/src/app/pages/client/direct/RoomProvider.tsx b/src/app/pages/client/direct/RoomProvider.tsx
index 550be1bd..c78a8f44 100644
--- a/src/app/pages/client/direct/RoomProvider.tsx
+++ b/src/app/pages/client/direct/RoomProvider.tsx
@@ -18,5 +18,9 @@ export function DirectRouteRoomProvider({ children }: { children: ReactNode }) {
     return <JoinBeforeNavigate roomIdOrAlias={roomIdOrAlias!} />;
   }
 
-  return <RoomProvider value={room}>{children}</RoomProvider>;
+  return (
+    <RoomProvider key={room.roomId} value={room}>
+      {children}
+    </RoomProvider>
+  );
 }
diff --git a/src/app/pages/client/home/RoomProvider.tsx b/src/app/pages/client/home/RoomProvider.tsx
index fdb5fb4f..282cee7d 100644
--- a/src/app/pages/client/home/RoomProvider.tsx
+++ b/src/app/pages/client/home/RoomProvider.tsx
@@ -18,5 +18,9 @@ export function HomeRouteRoomProvider({ children }: { children: ReactNode }) {
     return <JoinBeforeNavigate roomIdOrAlias={roomIdOrAlias!} />;
   }
 
-  return <RoomProvider value={room}>{children}</RoomProvider>;
+  return (
+    <RoomProvider key={room.roomId} value={room}>
+      {children}
+    </RoomProvider>
+  );
 }
diff --git a/src/app/pages/client/space/RoomProvider.tsx b/src/app/pages/client/space/RoomProvider.tsx
index ce038f01..6c58d9ee 100644
--- a/src/app/pages/client/space/RoomProvider.tsx
+++ b/src/app/pages/client/space/RoomProvider.tsx
@@ -22,5 +22,9 @@ export function SpaceRouteRoomProvider({ children }: { children: ReactNode }) {
     return <JoinBeforeNavigate roomIdOrAlias={roomIdOrAlias!} />;
   }
 
-  return <RoomProvider value={room}>{children}</RoomProvider>;
+  return (
+    <RoomProvider key={room.roomId} value={room}>
+      {children}
+    </RoomProvider>
+  );
 }