diff --git a/api/post.go b/api/post.go
index ca99eb15b7..88d0127d38 100644
--- a/api/post.go
+++ b/api/post.go
@@ -407,9 +407,9 @@ func sendNotificationsAndForget(c *Context, post *model.Post, team *model.Team,
 					}
 
 					// Add @all to keywords if user has them turned on
-					if profile.NotifyProps["all"] == "true" {
-						keywordMap["@all"] = append(keywordMap["@all"], profile.Id)
-					}
+					// if profile.NotifyProps["all"] == "true" {
+					// 	keywordMap["@all"] = append(keywordMap["@all"], profile.Id)
+					// }
 
 					// Add @channel to keywords if user has them turned on
 					if profile.NotifyProps["channel"] == "true" {
diff --git a/web/react/components/channel_header.jsx b/web/react/components/channel_header.jsx
index 6e12c7c14e..08c4a48eaa 100644
--- a/web/react/components/channel_header.jsx
+++ b/web/react/components/channel_header.jsx
@@ -101,9 +101,11 @@ export default class ChannelHeader extends React.Component {
         let terms = '';
         if (user.notify_props && user.notify_props.mention_keys) {
             const termKeys = UserStore.getCurrentMentionKeys();
-            if (user.notify_props.all === 'true' && termKeys.indexOf('@all') !== -1) {
-                termKeys.splice(termKeys.indexOf('@all'), 1);
-            }
+
+            // if (user.notify_props.all === 'true' && termKeys.indexOf('@all') !== -1) {
+            //     termKeys.splice(termKeys.indexOf('@all'), 1);
+            // }
+
             if (user.notify_props.channel === 'true' && termKeys.indexOf('@channel') !== -1) {
                 termKeys.splice(termKeys.indexOf('@channel'), 1);
             }
diff --git a/web/react/components/mention_list.jsx b/web/react/components/mention_list.jsx
index d1b27cf996..297d5c7194 100644
--- a/web/react/components/mention_list.jsx
+++ b/web/react/components/mention_list.jsx
@@ -183,12 +183,12 @@ export default class MentionList extends React.Component {
             }
         }
 
-        var all = {};
-        all.username = 'all';
-        all.nickname = '';
-        all.secondary_text = 'Notifies everyone in the team';
-        all.id = 'allmention';
-        users.push(all);
+        // var all = {};
+        // all.username = 'all';
+        // all.nickname = '';
+        // all.secondary_text = 'Notifies everyone in the team';
+        // all.id = 'allmention';
+        // users.push(all);
 
         var channel = {};
         channel.username = 'channel';
diff --git a/web/react/components/user_settings/user_settings_notifications.jsx b/web/react/components/user_settings/user_settings_notifications.jsx
index e36aed395a..e025bf6705 100644
--- a/web/react/components/user_settings/user_settings_notifications.jsx
+++ b/web/react/components/user_settings/user_settings_notifications.jsx
@@ -512,7 +512,7 @@ export default class NotificationsTab extends React.Component {
             }.bind(this);
             inputs.push(
                 <div key='userNotificationAllOption'>
-                    <div className='checkbox'>
+                    <div className='checkbox hidden'>
                         <label>
                             <input
                                 type='checkbox'
@@ -590,9 +590,11 @@ export default class NotificationsTab extends React.Component {
             if (this.state.mentionKey) {
                 keys.push('@' + user.username);
             }
-            if (this.state.allKey) {
-                keys.push('@all');
-            }
+
+            // if (this.state.allKey) {
+            //     keys.push('@all');
+            // }
+
             if (this.state.channelKey) {
                 keys.push('@channel');
             }
diff --git a/web/react/utils/constants.jsx b/web/react/utils/constants.jsx
index 6281813e96..372e155563 100644
--- a/web/react/utils/constants.jsx
+++ b/web/react/utils/constants.jsx
@@ -68,7 +68,8 @@ export default {
         TYPING: 'typing'
     },
 
-    SPECIAL_MENTIONS: ['all', 'channel'],
+    //SPECIAL_MENTIONS: ['all', 'channel'],
+    SPECIAL_MENTIONS: ['channel'],
     CHARACTER_LIMIT: 4000,
     IMAGE_TYPES: ['jpg', 'gif', 'bmp', 'png', 'jpeg'],
     AUDIO_TYPES: ['mp3', 'wav', 'wma', 'm4a', 'flac', 'aac'],