diff --git a/src/app/features/room-nav/RoomNavItem.tsx b/src/app/features/room-nav/RoomNavItem.tsx
index 6e4833de..323209bb 100644
--- a/src/app/features/room-nav/RoomNavItem.tsx
+++ b/src/app/features/room-nav/RoomNavItem.tsx
@@ -268,10 +268,9 @@ export function RoomNavItem({
     if (room.isCallRoom()) {
       if (!isMobile) {
         if (activeCallRoomId !== room.roomId) {
-          hangUp();
-          if (viewedCallRoomId === activeCallRoomId) setViewedCallRoomId(room.roomId);
-          setActiveCallRoomId(room.roomId);
           navigateRoom(room.roomId);
+          hangUp(room.roomId);
+          setActiveCallRoomId(room.roomId);
         } else {
           navigateRoom(room.roomId);
         }