1 files changed, 5 insertions, 6 deletions
diff --git a/server/sonar-web/src/main/js/apps/custom-measures/app.js b/server/sonar-web/src/main/js/apps/custom-measures/app.js
index 5d6c1c2b16c..81d58f58d84 100644
--- a/server/sonar-web/src/main/js/apps/custom-measures/app.js
+++ b/server/sonar-web/src/main/js/apps/custom-measures/app.js
@@ -4,6 +4,7 @@ import CustomMeasures from './custom-measures';
 import HeaderView from './header-view';
 import ListView from './list-view';
 import ListFooterView from './list-footer-view';
+import '../../helpers/handlebars-helpers';
 
 var App = new Marionette.Application(),
     init = function (options) {
@@ -15,13 +16,13 @@ var App = new Marionette.Application(),
 
       // Collection
       this.customMeasures = new CustomMeasures({
-        projectId: options.projectId
+        projectId: options.component.id
       });
 
       // Header View
       this.headerView = new HeaderView({
         collection: this.customMeasures,
-        projectId: options.projectId
+        projectId: options.component.id
       });
       this.layout.headerRegion.show(this.headerView);
 
@@ -42,10 +43,8 @@ var App = new Marionette.Application(),
     };
 
 App.on('start', function (options) {
-  window.requestMessages().done(function () {
-    init.call(App, options);
-  });
+  init.call(App, options);
 });
 
-export default App;
+window.sonarqube.appStarted.then(options => App.start(options));