diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
index 29efc975a38..f5669faebc9 100644
--- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
+++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix
@@ -130,12 +130,13 @@ in
         RewriteEngine On
         RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f
         RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d
-        RewriteRule ^(.*)$ %{DOCUMENT_ROOT}/${if config.articleUrlPrefix == ""
+        RewriteRule ${if config.enableUploads
+          then "!^/images"
+          else "^.*\$"
+        } %{DOCUMENT_ROOT}/${if config.articleUrlPrefix == ""
           then ""
           else "${config.articleUrlPrefix}/"
         }index.php [L]
-
-        RewriteRule ^/*$ ${mediawikiRoot}/index.php [L] # For syntax hilighter: */
       ''}
 
       <Directory ${mediawikiRoot}>