diff --git a/app/javascript/chat/chat.jsx b/app/javascript/chat/chat.jsx
index f4abc47f1..f74618ed6 100644
--- a/app/javascript/chat/chat.jsx
+++ b/app/javascript/chat/chat.jsx
@@ -453,6 +453,7 @@ export default class Chat extends Component {
     }
     let newMessages = [];
     if (
+      activeChannelId &&
       message.temp_id &&
       messages[activeChannelId].findIndex(
         (oldmessage) => oldmessage.temp_id === message.temp_id,