diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index a169cd75..b016b9ca 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -87,12 +87,13 @@ http {
       include /overrides/*.conf;
 
       # Actual logic
-      {% if WEBROOT_REDIRECT and WEB_WEBMAIL != '/' %}
+
       location / {
+      {% if WEBROOT_REDIRECT and WEB_WEBMAIL != '/' %}
         return 301 {{ WEBROOT_REDIRECT }};
-      }
       {% else %}
-        return 404
+        return 404;
+      }
       {% endif %}
 
       {% if WEBMAIL != 'none' %}