diff --git a/app/actions/views/channel.js b/app/actions/views/channel.js
index 452278588..c6903ad6b 100644
--- a/app/actions/views/channel.js
+++ b/app/actions/views/channel.js
@@ -411,7 +411,8 @@ export function handleSelectChannelByName(channelName, teamName) {
     return async (dispatch, getState) => {
         const state = getState();
         const {teams: currentTeams, currentTeamId} = state.entities.teams;
-        const currentTeamName = currentTeams[currentTeamId]?.name;
+        const currentTeam = currentTeams[currentTeamId];
+        const currentTeamName = currentTeam?.name;
         const {data: channel} = await dispatch(getChannelByNameAndTeamName(teamName || currentTeamName, channelName));
         const currentChannelId = getCurrentChannelId(state);
         if (channel && currentChannelId !== channel.id) {