diff --git a/modules/gerrit/templates/gerrit.vhost.erb b/modules/gerrit/templates/gerrit.vhost.erb
index 6ebe3c17a8..9bca07cc37 100644
--- a/modules/gerrit/templates/gerrit.vhost.erb
+++ b/modules/gerrit/templates/gerrit.vhost.erb
@@ -15,6 +15,7 @@
 <VirtualHost <%= scope.lookupvar("gerrit::vhost_name") %>:443>
   ServerName <%= scope.lookupvar("gerrit::vhost_name") %>
   ServerAdmin <%= scope.lookupvar("gerrit::serveradmin") %>
+  AllowEncodedSlashes NoDecode
 
   ErrorLog ${APACHE_LOG_DIR}/gerrit-ssl-error.log
 
@@ -55,7 +56,7 @@
 <% if scope.lookupvar("gerrit::robots_txt_source") != "" -%>
   RewriteCond %{REQUEST_URI} !^/robots.txt$
 <% end -%>
-  RewriteRule ^/(.*)$ http://localhost:8081/$1 [P]
+  RewriteRule ^/(.*)$ http://localhost:8081/$1 [NE,P]
 
   ProxyPassReverse / http://localhost:8081/