diff --git a/packages/rocketchat-ui/client/lib/RoomManager.js b/packages/rocketchat-ui/client/lib/RoomManager.js index 6b9fa7031083..af895ee9d5d2 100644 --- a/packages/rocketchat-ui/client/lib/RoomManager.js +++ b/packages/rocketchat-ui/client/lib/RoomManager.js @@ -265,7 +265,12 @@ Meteor.startup(() => { if ((currentUsername === undefined) && ((user != null ? user.username : undefined) != null)) { currentUsername = user.username; RoomManager.closeAllRooms(); - FlowRouter.reload(); + const roomTypes = RocketChat.roomTypes.roomTypes; + // Reload only if the current route is a channel route + const roomType = Object.keys(roomTypes).find(key => roomTypes[key].route && roomTypes[key].route.name === FlowRouter.current().route.name); + if (roomType) { + FlowRouter.reload(); + } } });