diff --git a/public/.htaccess b/public/.htaccess
index 699e1c1fc84e..0c8af8ebfc13 100644
--- a/public/.htaccess
+++ b/public/.htaccess
@@ -30,7 +30,7 @@ Options All -Indexes
     # request to the front controller, index.php
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
-	RewriteRule ^(.*)$ index.php/$1 [L]
+	RewriteRule ^(\s\S*)$ index.php/$1 [L,NC,QSA]
 
 	# Ensure Authorization header is passed along
     RewriteCond %{HTTP:Authorization} .