diff --git a/src/UserSettingsStore.js b/src/UserSettingsStore.js
index d6b32fab5e..6f689735a7 100644
--- a/src/UserSettingsStore.js
+++ b/src/UserSettingsStore.js
@@ -202,7 +202,10 @@ export default {
     isFeatureEnabled: function(featureId: string): boolean {
         const featuresConfig = SdkConfig.get()['features'];
 
-        let sdkConfigValue = 'disable';
+        // The old flag: honourned for backwards compat
+        const enableLabs = SdkConfig.get()['enableLabs'];
+
+        let sdkConfigValue = enableLabs ? 'labs' : 'disable';
         if (featuresConfig && featuresConfig[featureId] !== undefined) {
             sdkConfigValue = featuresConfig[featureId];
         }