diff --git a/core/nginx/conf/nginx.conf b/core/nginx/conf/nginx.conf
index 8b3d9be1..777b2a3d 100644
--- a/core/nginx/conf/nginx.conf
+++ b/core/nginx/conf/nginx.conf
@@ -84,9 +84,11 @@ http {
 
       # Actual logic
       {% if WEBMAIL != 'none' %}
+      {% if WEB_WEBMAIL != '/' %}
       location / {
         return 301 {{ WEB_WEBMAIL }};
       }
+      {% endif %}
 
       location {{ WEB_WEBMAIL }} {
         rewrite ^({{ WEB_WEBMAIL }})$ $1/ permanent;