diff --git a/src/app/organisms/room/JitsiRoom.jsx b/src/app/organisms/room/JitsiRoom.jsx
index 7b0cee60..e40ee59e 100644
--- a/src/app/organisms/room/JitsiRoom.jsx
+++ b/src/app/organisms/room/JitsiRoom.jsx
@@ -45,7 +45,10 @@ function JitsiRoom(props) {
       }
     };
 
-    navigation.once(cons.events.navigation.ROOM_SELECTED, handleRoomSelected);
+    navigation.on(cons.events.navigation.ROOM_SELECTED, handleRoomSelected);
+    return () => {
+      navigation.removeListener(cons.events.navigation.ROOM_SELECTED, handleRoomSelected);
+    };
   }, [mx, roomInfo]);
 
   useEffect(() => {
diff --git a/src/app/organisms/room/Room.jsx b/src/app/organisms/room/Room.jsx
index 77c1bb3b..15021d81 100644
--- a/src/app/organisms/room/Room.jsx
+++ b/src/app/organisms/room/Room.jsx
@@ -41,7 +41,10 @@ function Room(props) {
       }
     };
 
-    navigation.once(cons.events.navigation.ROOM_SELECTED, handleRoomSelected);
+    navigation.on(cons.events.navigation.ROOM_SELECTED, handleRoomSelected);
+    return () => {
+      navigation.removeListener(cons.events.navigation.ROOM_SELECTED, handleRoomSelected);
+    };
   }, [roomInfo]);
 
   useEffect(() => {