diff --git a/data/templates/nginx/server.tpl.conf b/data/templates/nginx/server.tpl.conf
index 0eb64dd8d..6316960c4 100644
--- a/data/templates/nginx/server.tpl.conf
+++ b/data/templates/nginx/server.tpl.conf
@@ -68,8 +68,9 @@ server {
     listen 443 ssl http2;
     listen [::]:443 ssl http2;
     server_name xmpp-upload.{{ domain }};
+    root /dev/null;
 
-    location /upload {
+    location /upload/ {
         alias /var/xmpp-upload/{{ domain }}/upload;
         # Pass all requests to metronome, except for GET and HEAD requests.
         limit_except GET HEAD {