diff --git a/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutorFactory.java b/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutorFactory.java
index 8da159f3c0..fa8507c917 100644
--- a/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutorFactory.java
+++ b/scm-webapp/src/main/java/sonia/scm/web/cgi/DefaultCGIExecutorFactory.java
@@ -52,7 +52,7 @@ import javax.servlet.http.HttpServletResponse;
  *
  * @author Sebastian Sdorra
  */
-public class DefaultCGIExecutorFactory implements CGIExecutorFactory
+public class DefaultCGIExecutorFactory implements CGIExecutorFactory, AutoCloseable
 {
 
   /**
@@ -92,6 +92,11 @@ public class DefaultCGIExecutorFactory implements CGIExecutorFactory
 
   //~--- fields ---------------------------------------------------------------
 
+  @Override
+  public void close() {
+    executor.shutdown();
+  }
+
   /** Field description */
   private final ExecutorService executor;
 }