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