diff --git a/app/javascript/mastodon/features/notifications/components/column_settings.jsx b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
index 3a8bd6943f..f9c734c18f 100644
--- a/app/javascript/mastodon/features/notifications/components/column_settings.jsx
+++ b/app/javascript/mastodon/features/notifications/components/column_settings.jsx
@@ -29,7 +29,12 @@ export default class ColumnSettings extends PureComponent {
   };
 
   onPushChange = (path, checked) => {
-    this.props.onChange(['push', ...path], checked);
+    const { pushSettings } = this.props;
+    const showPushSettings = pushSettings.get('browserSupport') && pushSettings.get('isSubscribed');
+
+    if (showPushSettings) {
+      this.props.onChange(['push', ...path], checked);
+    }
   };
 
   render () {