From 83e06a65a6e35fc29989cb5e0128b2ecbce4530a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Espino=20Garc=C3=ADa?= <larkox@gmail.com>
Date: Mon, 6 Nov 2023 13:19:58 +0100
Subject: [PATCH] Fix error when updating a GM/DM (#25186)

---
 webapp/channels/src/actions/websocket_actions.jsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webapp/channels/src/actions/websocket_actions.jsx b/webapp/channels/src/actions/websocket_actions.jsx
index 74b47e8b80..5d4cc67c59 100644
--- a/webapp/channels/src/actions/websocket_actions.jsx
+++ b/webapp/channels/src/actions/websocket_actions.jsx
@@ -644,7 +644,8 @@ export function handleChannelUpdatedEvent(msg) {
 
         if (channel.id === getCurrentChannelId(state)) {
             // using channel's team_id to ensure we always redirect to current channel even if channel's team changes.
-            getHistory().replace(`${getRelativeTeamUrl(state, channel.team_id)}/channels/${channel.name}`);
+            const teamId = channel.team_id || getCurrentTeamId(state);
+            getHistory().replace(`${getRelativeTeamUrl(state, teamId)}/channels/${channel.name}`);
         }
     };
 }