diff --git a/conf/nginx.conf b/conf/nginx.conf
index 854795e..6d7ea16 100644
--- a/conf/nginx.conf
+++ b/conf/nginx.conf
@@ -60,7 +60,7 @@ location __PATH__  {
     # by denying dot files and rewrite request to the front controller
     location ^~ /.well-known/ {
         allow all;
-        rewrite ^/(.*) /index.php?pagename=$uri&$args last;
+        rewrite ^/(.*) /index.php?pagename=$request_uri&$args last;
     }
 
     #statically serve these file types when possible
@@ -69,7 +69,7 @@ location __PATH__  {
     #added .htm for advanced source code editor library
     location ~* \.(jpg|jpeg|gif|png|ico|css|js|htm|html|ttf|woff|svg)$ {
         expires 30d;
-        try_files $uri /index.php?pagename=$uri&$args;
+        try_files $uri /index.php?pagename=$request_uri&$args;
     }
 
     #block these file types