diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js
index b075db166f..e3f0c9be83 100644
--- a/src/components/structures/MatrixChat.js
+++ b/src/components/structures/MatrixChat.js
@@ -139,10 +139,6 @@ module.exports = React.createClass({
         return this.props.config.default_is_url || "https://vector.im";
     },
 
-    getEnableLabs() {
-        return this.props.config.enableLabs === undefined ? true : this.props.config.enableLabs;
-    },
-
     componentWillMount: function() {
         this.favicon = new Favico({animation: 'none'});
 
@@ -1068,7 +1064,7 @@ module.exports = React.createClass({
                         onClose={this.onUserSettingsClose}
                         version={this.state.version}
                         brand={this.props.config.brand}
-                        enableLabs={this.getEnableLabs()}
+                        enableLabs={this.props.config.enableLabs}
                     />
                     right_panel = <RightPanel collapsed={this.state.collapse_rhs} opacity={this.state.sideOpacity}/>
                     break;
diff --git a/src/components/structures/UserSettings.js b/src/components/structures/UserSettings.js
index 8ee9cbd2dc..2885606f27 100644
--- a/src/components/structures/UserSettings.js
+++ b/src/components/structures/UserSettings.js
@@ -52,7 +52,7 @@ module.exports = React.createClass({
         brand: React.PropTypes.string,
 
         // True to show the 'labs' section of experimental features
-        enableLabs: React.PropTypes.boolean,
+        enableLabs: React.PropTypes.bool,
     },
 
     getDefaultProps: function() {
@@ -363,7 +363,7 @@ module.exports = React.createClass({
     },
 
     _renderLabs: function () {
-        if (!this.props.enableLabs) return false;
+        if (this.props.enableLabs === false) return null;
 
         let features = LABS_FEATURES.map(feature => (
             <div key={feature.id} className="mx_UserSettings_toggle">