diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx
index cfffc70ee7..bb7508a40b 100644
--- a/webapp/components/channel_header.jsx
+++ b/webapp/components/channel_header.jsx
@@ -101,6 +101,10 @@ export default class ChannelHeader extends React.Component {
         document.removeEventListener('keydown', this.openRecentMentions);
     }
 
+    shouldComponentUpdate(nextProps) {
+        return !!nextProps.channelId;
+    }
+
     onListenerChange() {
         const newState = this.getStateFromStores();
         if (!Utils.areObjectsEqual(newState, this.state)) {