diff --git a/images/nginx/nginx-template.conf b/images/nginx/nginx-template.conf
index 52e78942..b1d5162f 100644
--- a/images/nginx/nginx-template.conf
+++ b/images/nginx/nginx-template.conf
@@ -53,18 +53,6 @@ server {
 		proxy_pass http://socketio-server;
 	}
   
-	location @webserver {
-		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-		proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
-		proxy_set_header X-Frappe-Site-Name ${FRAPPE_SITE_NAME_HEADER};
-		proxy_set_header Host $host;
-		proxy_set_header X-Use-X-Accel-Redirect True;
-		proxy_read_timeout 120;
-		proxy_redirect off;
-
-		proxy_pass  http://backend-server;
-	}
-  
 	location / {
 		rewrite ^(.+)/$ $proxy_x_forwarded_proto://$http_host$1 permanent;
 		rewrite ^(.+)/index\.html$ $proxy_x_forwarded_proto://$http_host$1 permanent;
@@ -77,7 +65,19 @@ server {
 
 		try_files /sites/${FRAPPE_SITE_NAME_HEADER}/public/$uri @webserver;
 	}
+  
+	location @webserver {
+		proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+		proxy_set_header X-Forwarded-Proto $proxy_x_forwarded_proto;
+		proxy_set_header X-Frappe-Site-Name ${FRAPPE_SITE_NAME_HEADER};
+		proxy_set_header Host $host;
+		proxy_set_header X-Use-X-Accel-Redirect True;
+		proxy_read_timeout 120;
+		proxy_redirect off;
 
+		proxy_pass  http://backend-server;
+	}
+  
 	# error pages
 	error_page 502 /502.html;
 	location /502.html {