diff --git a/.htaccess b/.htaccess
index db4f32a1fbb..32060738ab1 100644
--- a/.htaccess
+++ b/.htaccess
@@ -129,11 +129,10 @@
 ## Rule: Map /remote* --> /remote.php* including the query string
 ##
 ## Context:
-##    - XXX: `QSA` seems unnecessary (no-op) here (query string is passed by default when the replacement URI doesn't contain a query string)
 ##    - XXX: Is this even used anymore? Seems a relic from <NC12
 ##
 
-    RewriteRule ^remote/(.*) remote.php [QSA,L]
+    RewriteRule ^remote/(.*) remote.php [L]
 
 ##
 ## Rule: Prevent access to non-public files
@@ -148,21 +147,19 @@
 ##    - Intentionally excludes URIs used for HTTPS certificate verifications
 ##        - RFC 8555 / ACME HTTP Challenges (acme-challenge) 
 ##        - File-based Validations (pki-validation)
-##    - XXX: `QSA` seems unnecessary (no-op) here (query string is passed by default when the replacement URI doesn't contain a query string)
 ##    - XXX: Sometimes we are using `/index.php` and other times `index.php` as our replacement URI; this may be incorrect
 ##
 
-    RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [QSA,L]
+    RewriteRule ^\.well-known/(?!acme-challenge|pki-validation) /index.php [L]
 
 ##
 ## Rule: Map the ocm-provider handling to our main frontend controller (/index.php)
 ##
 ## Context:
-##    - XXX: `QSA` seems unnecessary (no-op) here (query string is passed by default when the replacement URI doesn't contain a query string)
 ##    - XXX: Sometimes we are using `/index.php` and other times `index.php` as our replacement URI; this may be incorrect
 ##
 
-    RewriteRule ^ocm-provider/?$ index.php [QSA,L]
+    RewriteRule ^ocm-provider/?$ index.php [L]
 
 ##
 ## Rule: Prevent access to more non-public files