diff --git oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
index a64874a..9bee8d8 100644
--- oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
+++ oak-core/src/main/java/org/apache/jackrabbit/oak/Oak.java
@@ -576,8 +576,11 @@ public class Oak {
                 workspaceInitializers, store, defaultWorkspaceName, indexEditors);
 
         // add index hooks later to prevent the OakInitializer to do excessive indexing
-        with(new IndexUpdateProvider(indexEditors));
-        withEditorHook();
+        List<EditorProvider> updatedEditorProviders = newArrayList(editorProviders);
+        updatedEditorProviders.add(new IndexUpdateProvider(indexEditors));
+
+        List<CommitHook> updatedCommitHooks = newArrayList(commitHooks);
+        updatedCommitHooks.add(new EditorHook(CompositeEditorProvider.compose(updatedEditorProviders)));
 
         // Register observer last to prevent sending events while initialising
         for (Observer observer : observers) {