diff --git a/src/components/views/rooms/RoomSettings.js b/src/components/views/rooms/RoomSettings.js
index 774d136e45..b69938a117 100644
--- a/src/components/views/rooms/RoomSettings.js
+++ b/src/components/views/rooms/RoomSettings.js
@@ -947,9 +947,10 @@ module.exports = React.createClass({
             </AccessibleButton>;
         }
 
-        const devtoolsButton = <AccessibleButton className="mx_RoomSettings_devtoolsButton" onClick={this._openDevtools}>
+        const devtoolsButton = SettingsStore.getValue("showDeveloperTools") ?
+        (<AccessibleButton className="mx_RoomSettings_devtoolsButton" onClick={this._openDevtools}>
             { _t("Open Devtools") }
-        </AccessibleButton>;
+        </AccessibleButton>) : null;
 
         return (
             <div className="mx_RoomSettings">