diff --git a/src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigServlet.java b/src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigServlet.java
index 9721b1e..5ed4a0e 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigServlet.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/simplesubmitrules/config/ConfigServlet.java
@@ -38,6 +38,7 @@
 public class ConfigServlet
     implements RestReadView<ProjectResource>, RestModifyView<ProjectResource, SubmitConfig> {
   private final ProjectCache projectCache;
+  private final ProjectConfig.Factory projectConfigFactory;
   private final PermissionBackend permissionBackend;
   private final MetaDataUpdate.User metaDataUpdateFactory;
   private final ConfigTranslator configTranslator;
@@ -47,8 +48,10 @@
       ProjectCache projectCache,
       PermissionBackend permissionBackend,
       MetaDataUpdate.User metaDataUpdateFactory,
-      ConfigTranslator configTranslator) {
+      ConfigTranslator configTranslator,
+      ProjectConfig.Factory projectConfigFactory) {
     this.projectCache = projectCache;
+    this.projectConfigFactory = projectConfigFactory;
     this.permissionBackend = permissionBackend;
     this.metaDataUpdateFactory = metaDataUpdateFactory;
     this.configTranslator = configTranslator;
@@ -76,7 +79,7 @@
 
     IdentifiedUser user = resource.getUser().asIdentifiedUser();
     try (MetaDataUpdate md = metaDataUpdateFactory.create(projectName, user)) {
-      ProjectConfig projectConfig = ProjectConfig.read(md);
+      ProjectConfig projectConfig = projectConfigFactory.read(md);
       configTranslator.applyTo(inConfig, projectConfig);
       projectConfig.commit(md);
       projectCache.evict(projectName);
