diff --git a/web/react/components/channel_notifications_modal.jsx b/web/react/components/channel_notifications_modal.jsx
index 79b769c8a3..bae1f13f01 100644
--- a/web/react/components/channel_notifications_modal.jsx
+++ b/web/react/components/channel_notifications_modal.jsx
@@ -32,11 +32,13 @@ export default class ChannelNotificationsModal extends React.Component {
             activeSection: ''
         };
     }
-    componentDidMount() {
-        ChannelStore.addChangeListener(this.onListenerChange);
-    }
-    componentWillUnmount() {
-        ChannelStore.removeChangeListener(this.onListenerChange);
+    componentWillReceiveProps(nextProps) {
+        if (nextProps.show) {
+            this.onListenerChange();
+            ChannelStore.addChangeListener(this.onListenerChange);
+        } else {
+            ChannelStore.removeChangeListener(this.onListenerChange);
+        }
     }
     onListenerChange() {
         const curChannelId = ChannelStore.getCurrentId();