diff --git a/.htaccess b/.htaccess
index 4a0d9e8977b..a1ad665eed0 100644
--- a/.htaccess
+++ b/.htaccess
@@ -109,10 +109,10 @@
         Require all denied
     </FilesMatch>
 
-    # Except those whitelisted bellow.
-    <FilesMatch "^(index|index_dev|filemanager|upgrade)\.php$">
+    # Except those allowed below.
+    <If "%{REQUEST_URI} =~ m#^/(index|index_dev|upgrade/upgrade)\.php#">
         Require all granted
-    </FilesMatch>
+    </If>
 </IfModule>
 
 # Fallback for Apache < 2.4
@@ -129,10 +129,10 @@
         Deny from all
     </FilesMatch>
 
-    # Except those whitelisted bellow.
-    <FilesMatch "^(index|index_dev|filemanager|upgrade)\.php$">
+    # Except those allowed below.
+    <If "%{REQUEST_URI} =~ m#^/(index|index_dev|upgrade/upgrade)\.php#">
         Order allow,deny
         Allow from all
-    </FilesMatch>
+    </If>
 </IfModule>
 
diff --git a/app/assets/scaffold/files/htaccess b/app/assets/scaffold/files/htaccess
index 4a0d9e8977b..018999d3ff3 100644
--- a/app/assets/scaffold/files/htaccess
+++ b/app/assets/scaffold/files/htaccess
@@ -109,10 +109,10 @@
         Require all denied
     </FilesMatch>
 
-    # Except those whitelisted bellow.
-    <FilesMatch "^(index|index_dev|filemanager|upgrade)\.php$">
+    # Except those allowed below.
+    <If "%{REQUEST_URI} =~ m#^/(index|index_dev|upgrade/upgrade)\.php#">
         Require all granted
-    </FilesMatch>
+    </If>
 </IfModule>
 
 # Fallback for Apache < 2.4
@@ -129,10 +129,9 @@
         Deny from all
     </FilesMatch>
 
-    # Except those whitelisted bellow.
-    <FilesMatch "^(index|index_dev|filemanager|upgrade)\.php$">
+    # Except those allowed below.
+    <If "%{REQUEST_URI} =~ m#^/(index|index_dev|upgrade/upgrade)\.php#">
         Order allow,deny
         Allow from all
-    </FilesMatch>
+    </If>
 </IfModule>
-