diff --git a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
index 6e38e4b744..318b122c80 100644
--- a/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
+++ b/scm-webapp/src/main/java/sonia/scm/repository/DefaultRepositoryManager.java
@@ -852,7 +852,12 @@ public class DefaultRepositoryManager extends AbstractRepositoryManager
   @Override
   protected RepositoryHookEvent prepareHookEvent(RepositoryHookEvent event)
   {
-    return SynchronizedRepositoryHookEvent.wrap(event, preProcessorUtil);
+    if (!(event instanceof ExtendedRepositoryHookEvent))
+    {
+      event = SynchronizedRepositoryHookEvent.wrap(event, preProcessorUtil);
+    }
+
+    return event;
   }
 
   /**