diff --git a/conf/nginx.conf b/conf/nginx.conf
index f6ad844..82bf57b 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -5,12 +5,6 @@ location ^~ __PATH__/ {
   # Path to source
   alias __FINALPATH__/public/;
 
-  try_files $uri $uri/ index.php?q=;
-
-  if (!-e $request_filename) {
-    rewrite ^(.+)$ __PATH__/index.php?q= last;
-  }
-
   # Add headers to serve security related headers
   more_set_headers "Strict-Transport-Security: max-age=15768000; includeSubDomains; preload;";
   more_set_headers "X-Content-Type-Options: nosniff";
@@ -22,6 +16,8 @@ location ^~ __PATH__/ {
 
   index index.php index.html index.htm;
 
+  try_files $uri $uri/ __PATH__/__PATH__/index.php?q=;
+
   location ~ ^__PATH__/index\.php(/.*|)$ {
     fastcgi_split_path_info ^(.+?\.php)(/.*|)$;
     set $path_info $fastcgi_path_info;