diff --git a/templates/nginx.default.conf.j2 b/templates/nginx.default.conf.j2
index 6c1b877..7ea4f5f 100644
--- a/templates/nginx.default.conf.j2
+++ b/templates/nginx.default.conf.j2
@@ -46,9 +46,6 @@ server {
 
   location /_d4sauth {
     js_content pep.enforce;
-    if (!-e $request_filename){
-      rewrite ^(.+)$ / last;
-    }    
   }
 
   location @backend {
@@ -64,6 +61,7 @@ server {
     proxy_set_header Authorization "Bearer $auth_token";
     proxy_set_header remote_user "$remote_user";
     proxy_pass http://_inception-server;
+    rewrite ^/_d4sauth(.+)$ / last;
   }
 
   location /gcube_user_info {