diff --git a/scm-webapp/src/main/java/sonia/scm/WebResourceServlet.java b/scm-webapp/src/main/java/sonia/scm/WebResourceServlet.java
index 6405c16ddc..222800c9e3 100644
--- a/scm-webapp/src/main/java/sonia/scm/WebResourceServlet.java
+++ b/scm-webapp/src/main/java/sonia/scm/WebResourceServlet.java
@@ -23,6 +23,7 @@ import java.net.URL;
  * @since 2.0.0
  */
 @Singleton
+@Priority(WebResourceServlet.PRIORITY)
 @WebElement(value = WebResourceServlet.PATTERN, regex = true)
 public class WebResourceServlet extends HttpServlet {
 
@@ -33,7 +34,10 @@ public class WebResourceServlet extends HttpServlet {
    * TODO remove old protocol servlets and hook. Move /hook/hg to api?
    */
   @VisibleForTesting
-  static final String PATTERN = "/(?!api/|git/|hg/|svn/|hook/|repo/|locales/).*";
+  static final String PATTERN = "/(?!api/|git/|hg/|svn/|hook/|repo/).*";
+
+  // Be sure that this servlet is the last one in the servlet chain.
+  static final int PRIORITY = Integer.MAX_VALUE;
 
   private static final Logger LOG = LoggerFactory.getLogger(WebResourceServlet.class);