diff --git a/mods/sample-nginx.config b/mods/sample-nginx.config
index a6760c0ad7..55a0d3a504 100644
--- a/mods/sample-nginx.config
+++ b/mods/sample-nginx.config
@@ -82,27 +82,22 @@ server {
 
   # rewrite to front controller as default rule
   location / {
-    if ($is_args != "") {
-        rewrite ^/(.*) /index.php?pagename=$uri&$args last;
+	if (!-e $request_filename) {
+		rewrite ^(.*)$ /index.php?pagename=$1;
     }
-    rewrite ^/(.*) /index.php?pagename=$uri last;
   }
+  
 
   # make sure webfinger and other well known services aren't blocked
   # by denying dot files and rewrite request to the front controller
   location ^~ /.well-known/ {
     allow all;
-    rewrite ^/(.*) /index.php?pagename=$uri&$args last;
-  }
-
-  # statically serve these file types when possible
-  # otherwise fall back to front controller
-  # allow browser to cache them
-  # 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;
+   if (!-e $request_filename) {
+	 rewrite ^(.*)$ /index.php?pagename=$1;
+   }
   }
+  
+  include mime.types;
 
   # block these file types
   location ~* \.(tpl|md|tgz|log|out)$ {