diff --git a/keyserver/src/responders/redux-state-responders.js b/keyserver/src/responders/redux-state-responders.js --- a/keyserver/src/responders/redux-state-responders.js +++ b/keyserver/src/responders/redux-state-responders.js @@ -243,14 +243,13 @@ } } + const curActiveChatThreadID = finalNavInfo.activeChatThreadID; if ( - finalNavInfo.activeChatThreadID && - threadIsPending(finalNavInfo.activeChatThreadID) && - finalNavInfo.pendingThread?.id !== finalNavInfo.activeChatThreadID + curActiveChatThreadID && + threadIsPending(curActiveChatThreadID) && + finalNavInfo.pendingThread?.id !== curActiveChatThreadID ) { - const pendingThreadData = parsePendingThreadID( - finalNavInfo.activeChatThreadID, - ); + const pendingThreadData = parsePendingThreadID(curActiveChatThreadID); if ( pendingThreadData && pendingThreadData.threadType !== threadTypes.SIDEBAR &&