diff --git a/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java b/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
index 4f61ebaa17..40fb345caa 100644
--- a/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
+++ b/scm-webapp/src/main/java/sonia/scm/ScmContextListener.java
@@ -132,8 +132,6 @@ public class ScmContextListener extends GuiceResteasyBootstrapServletContextList
     List<Module> moduleList = Lists.newArrayList();
 
     moduleList.add(new ResteasyModule());
-    moduleList.add(new ScmInitializerModule());
-    moduleList.add(new EagerSingletonModule());
     moduleList.add(ShiroWebModule.guiceFilterModule());
     moduleList.add(new WebElementModule(pluginLoader));
     moduleList.add(new ScmServletModule(context, pluginLoader, overrides));
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 86e62d8f94..69e70828a2 100644
--- a/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java
+++ b/scm-webapp/src/main/java/sonia/scm/boot/BootstrapContextListener.java
@@ -39,9 +39,11 @@ import com.google.inject.Module;
 import com.google.inject.assistedinject.FactoryModuleBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sonia.scm.EagerSingletonModule;
 import sonia.scm.SCMContext;
 import sonia.scm.ScmContextListener;
 import sonia.scm.ScmEventBusModule;
+import sonia.scm.ScmInitializerModule;
 import sonia.scm.Stage;
 import sonia.scm.event.ScmEventBus;
 import sonia.scm.plugin.DefaultPluginLoader;
@@ -150,9 +152,18 @@ public class BootstrapContextListener implements ServletContextListener {
 
       Module scmContextListenerModule = new ScmContextListenerModule();
       BootstrapModule bootstrapModule = new BootstrapModule(pluginLoader);
+      ScmInitializerModule scmInitializerModule = new ScmInitializerModule();
+      EagerSingletonModule eagerSingletonModule = new EagerSingletonModule();
       ScmEventBusModule scmEventBusModule = new ScmEventBusModule();
 
-      Injector bootstrapInjector = Guice.createInjector(bootstrapModule, scmContextListenerModule, scmEventBusModule);
+      Injector bootstrapInjector =
+        Guice.createInjector(
+          bootstrapModule,
+          scmContextListenerModule,
+          scmEventBusModule,
+          scmInitializerModule,
+          eagerSingletonModule
+        );
 
       processUpdates(pluginLoader, bootstrapInjector);