diff --git a/templates/nginx.j2 b/templates/nginx.j2
index fd5c27a..3b78602 100644
--- a/templates/nginx.j2
+++ b/templates/nginx.j2
@@ -26,7 +26,7 @@ server {
 	}
 
 	location / {
-		rewrite ^ /index.php$request_uri;
+		rewrite ^ /index.php;
 	}
 
 	location ~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/ {
@@ -38,6 +38,7 @@ server {
 
 	location ~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+)\.php(?:$|/) {
 		fastcgi_split_path_info ^(.+?\.php)(/.*)$;
+		try_files $fastcgi_script_name =404;
 		include fastcgi_params;
 		fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
 		fastcgi_param PATH_INFO $fastcgi_path_info;