1 files changed, 10 insertions, 6 deletions

diff --git a/src/stores/FeaturesStore.js b/src/stores/FeaturesStore.js
index f788c347d..9740d078f 100644
--- a/src/stores/FeaturesStore.js
+++ b/src/stores/FeaturesStore.js
@@ -3,15 +3,19 @@ import { computed, observable } from 'mobx';
 import Store from './lib/Store';
 import CachedRequest from './lib/CachedRequest';
 
+import delayApp from '../features/delayApp';
+
 export default class FeaturesStore extends Store {
   @observable defaultFeaturesRequest = new CachedRequest(this.api.features, 'default');
   @observable featuresRequest = new CachedRequest(this.api.features, 'features');
 
-  setup() {
+  async setup() {
     this.registerReactions([
       this._monitorLoginStatus.bind(this),
-      this._debugFeatures.bind(this),
     ]);
+
+    await this.featuresRequest._promise;
+    setTimeout(this._enableFeatures.bind(this), 1);
   }
 
   @computed get features() {
@@ -22,10 +26,6 @@ export default class FeaturesStore extends Store {
     return this.defaultFeaturesRequest.execute().result || {};
   }
 
-  _debugFeatures() {
-    console.log(this.features);
-  }
-
   _monitorLoginStatus() {
     if (this.stores.user.isLoggedIn) {
       this.featuresRequest.invalidate({ immediately: true });
@@ -33,4 +33,8 @@ export default class FeaturesStore extends Store {
       this.defaultFeaturesRequest.invalidate({ immediately: true });
     }
   }
+
+  _enableFeatures() {
+    delayApp(this.stores, this.actions);
+  }
 }