1 files changed, 7 insertions, 3 deletions
diff --git a/webapp/components/channel_header.jsx b/webapp/components/channel_header.jsx
index 365e8ed21..3449a0fd6 100644
--- a/webapp/components/channel_header.jsx
+++ b/webapp/components/channel_header.jsx
@@ -128,10 +128,14 @@ export default class ChannelHeader extends React.Component {
         if (user.notify_props && user.notify_props.mention_keys) {
             const termKeys = UserStore.getMentionKeys(user.id);
 
-            if (user.notify_props.channel === 'true' && termKeys.indexOf('@channel') !== -1 && termKeys.indexOf('@all') !== -1) {
-                termKeys.splice(termKeys.indexOf('@channel'), 1);
-                termKeys.splice(termKeys.indexOf('@all'), 1);
+            if (termKeys.indexOf('@channel') !== -1) {
+                termKeys[termKeys.indexOf('@channel')] = '';
             }
+
+            if (termKeys.indexOf('@all') !== -1) {
+                termKeys[termKeys.indexOf('@all')] = '';
+            }
+
             terms = termKeys.join(' ');
         }