diff --git a/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java b/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
index 6dbc33af03..4f61ebaa17 100644
--- a/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
@@ -133,7 +133,6 @@ public class ScmContextListener extends GuiceResteasyBootstrapServletContextList
 
     moduleList.add(new ResteasyModule());
     moduleList.add(new ScmInitializerModule());
-    moduleList.add(new ScmEventBusModule());
     moduleList.add(new EagerSingletonModule());
     moduleList.add(ShiroWebModule.guiceFilterModule());
     moduleList.add(new WebElementModule(pluginLoader));
diff --git a/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java b/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java
index b2dcbbba4a..86e62d8f94 100644
--- a/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java
+++ b/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java
@@ -41,6 +41,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import sonia.scm.SCMContext;
 import sonia.scm.ScmContextListener;
+import sonia.scm.ScmEventBusModule;
 import sonia.scm.Stage;
 import sonia.scm.event.ScmEventBus;
 import sonia.scm.plugin.DefaultPluginLoader;
@@ -149,8 +150,9 @@ public class BootstrapContextListener implements ServletContextListener {
 
       Module scmContextListenerModule = new ScmContextListenerModule();
       BootstrapModule bootstrapModule = new BootstrapModule(pluginLoader);
+      ScmEventBusModule scmEventBusModule = new ScmEventBusModule();
 
-      Injector bootstrapInjector = Guice.createInjector(bootstrapModule, scmContextListenerModule);
+      Injector bootstrapInjector = Guice.createInjector(bootstrapModule, scmContextListenerModule, scmEventBusModule);
 
       processUpdates(pluginLoader, bootstrapInjector);