diff --git a/webapp/components/user_settings/email_notification_setting.jsx b/webapp/components/user_settings/email_notification_setting.jsx
index 1e6c5d7f53..6980be0b73 100644
--- a/webapp/components/user_settings/email_notification_setting.jsx
+++ b/webapp/components/user_settings/email_notification_setting.jsx
@@ -57,10 +57,42 @@ export default class EmailNotificationSetting extends React.Component {
     }
 
     render() {
+        if (global.window.mm_config.SendEmailNotifications !== 'true' && this.props.activeSection === 'email') {
+            const inputs = [];
+
+            inputs.push(
+                <div
+                    key='oauthEmailInfo'
+                    className='padding-top'
+                >
+                    <FormattedMessage
+                        id='user.settings.notifications.email.disabled_long'
+                        defaultMessage='Email notifications have been disabled by your System Administrator.'
+                    />
+                </div>
+            );
+
+            return (
+                <SettingItemMax
+                    title={localizeMessage('user.settings.notifications.emailNotifications', 'Email notifications')}
+                    inputs={inputs}
+                    server_error={this.state.serverError}
+                    updateSection={this.collapse}
+                />
+            );
+        }
+
         if (this.props.activeSection !== 'email') {
             let description;
 
-            if (this.props.enableEmail) {
+            if (global.window.mm_config.SendEmailNotifications !== 'true') {
+                description = (
+                    <FormattedMessage
+                        id='user.settings.notifications.email.disabled'
+                        defaultMessage='Disabled by System Administrator'
+                    />
+                );
+            } else if (this.props.enableEmail) {
                 switch (this.state.emailInterval) {
                 case Preferences.INTERVAL_IMMEDIATE:
                     description = (
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 05abf6ae26..7380cd4cbc 100755
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -2163,6 +2163,8 @@
   "user.settings.notifications.desktop.title": "Desktop notifications",
   "user.settings.notifications.desktop.unlimited": "Unlimited",
   "user.settings.notifications.desktopSounds": "Desktop notification sounds",
+  "user.settings.notifications.email.disabled": "Disabled by System Administrator",
+  "user.settings.notifications.email.disabled_long": "Email notifications have been disabled by your System Administrator.",
   "user.settings.notifications.email.everyHour": "Every hour",
   "user.settings.notifications.email.everyXMinutes": "Every {count, plural, one {minute} other {{count, number} minutes}}",
   "user.settings.notifications.email.immediately": "Immediately",