diff --git a/media/.htaccess b/media/.htaccess
index 770d054bd2b..7555f6acf59 100644
--- a/media/.htaccess
+++ b/media/.htaccess
@@ -1,6 +1,14 @@
 Options All -Indexes
+
+############################################
+## Disable PHP7/PHP8 code execution for media directory
+
 <IfModule mod_php7.c>
-php_flag engine 0
+    php_flag engine 0
+</IfModule>
+
+<IfModule mod_php8.c>
+    php_flag engine 0
 </IfModule>
 
 AddHandler cgi-script .php .pl .py .jsp .asp .htm .shtml .sh .cgi
@@ -9,17 +17,19 @@ Options -ExecCGI
 <IfModule mod_rewrite.c>
 
 ############################################
-## enable rewrites
+## Enable rewrites
 
     Options +FollowSymLinks
     RewriteEngine on
 
 ############################################
-## never rewrite for existing files
+## Never rewrite for existing files
+
     RewriteCond %{REQUEST_FILENAME} !-f
 
 ############################################
-## rewrite everything else to get.php
+## Rewrite everything else to get.php
+
+    RewriteRule (.*) ../get.php [L]
 
-    RewriteRule .* ../get.php [L]
 </IfModule>