diff --git a/src/SdkConfig.js b/src/SdkConfig.js
index 1452aaa64b..8d8e93a889 100644
--- a/src/SdkConfig.js
+++ b/src/SdkConfig.js
@@ -19,6 +19,8 @@ var DEFAULTS = {
     integrations_ui_url: "https://scalar.vector.im/",
     // Base URL to the REST interface of the integrations server
     integrations_rest_url: "https://scalar.vector.im/api",
+    // Where to send bug reports. If not specified, bugs cannot be sent.
+    bug_report_endpoint_url: null,
 };
 
 class SdkConfig {
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 8294eee6df..65e41abb24 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -26,6 +26,7 @@ var UserSettingsStore = require('../../UserSettingsStore');
 var GeminiScrollbar = require('react-gemini-scrollbar');
 var Email = require('../../email');
 var AddThreepid = require('../../AddThreepid');
+var SdkConfig = require('../../SdkConfig');
 
 // if this looks like a release, use the 'version' from package.json; else use
 // the git sha.
@@ -491,7 +492,9 @@ module.exports = React.createClass({
     },
 
     _renderBugReport: function() {
-        // TODO: If there is no bug report endpoint, hide this.
+        if (!SdkConfig.get().bug_report_endpoint_url) {
+            return <div />
+        }
         return (
             <div>
                 <h3>Bug Report</h3>