diff --git a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
index abdbb7c582..54d4928d83 100644
--- a/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
+++ b/src/components/views/settings/tabs/user/GeneralUserSettingsTab.js
@@ -248,7 +248,9 @@ export default class GeneralUserSettingsTab extends React.Component {
         // validate 3PID ownership even if we're just adding to the homeserver only.
         // For newer homeservers with separate 3PID add and bind methods (MSC2290),
         // there is no such concern, so we can always show the HS account 3PIDs.
-        if (this.state.haveIdServer || this.state.serverSupportsSeparateAddAndBind === true) {
+        if (SettingsStore.getValue(UIFeature.ThirdPartyID) &&
+            (this.state.haveIdServer || this.state.serverSupportsSeparateAddAndBind === true)
+        ) {
             const emails = this.state.loading3pids
                 ? <Spinner />
                 : <EmailAddresses
diff --git a/src/settings/Settings.ts b/src/settings/Settings.ts
index c3057b67aa..2a699897a6 100644
--- a/src/settings/Settings.ts
+++ b/src/settings/Settings.ts
@@ -649,6 +649,12 @@ export const SETTINGS: {[setting: string]: ISetting} = {
     [UIFeature.IdentityServer]: {
         supportedLevels: LEVELS_UI_FEATURE,
         default: true,
+        // Identity Server (Discovery) Settings make no sense if 3PIDs in general are hidden
+        controller: new UIFeatureController(UIFeature.ThirdPartyID),
+    },
+    [UIFeature.ThirdPartyID]: {
+        supportedLevels: LEVELS_UI_FEATURE,
+        default: true,
     },
     [UIFeature.Flair]: {
         supportedLevels: LEVELS_UI_FEATURE,
diff --git a/src/settings/UIFeature.ts b/src/settings/UIFeature.ts
index 3f7ae9ea4b..92a34e9fbb 100644
--- a/src/settings/UIFeature.ts
+++ b/src/settings/UIFeature.ts
@@ -26,5 +26,6 @@ export enum UIFeature {
     ShareQRCode = "UIFeature.shareQrCode",
     ShareSocial = "UIFeature.shareSocial",
     IdentityServer = "UIFeature.identityServer",
+    ThirdPartyID = "UIFeature.thirdPartyId",
     Flair = "UIFeature.flair",
 }