diff --git a/installation/mastodon.conf b/installation/mastodon.conf
index 5a1146db1..5a6d16b99 100644
--- a/installation/mastodon.conf
+++ b/installation/mastodon.conf
@@ -101,6 +101,13 @@ server {
     try_files $uri @mastodon-packs;
   }
 
+  # Mastodon Media
+  location /system {
+    add_header Cache-Control "public, max-age=31536000, immutable";
+    add_header Strict-Transport-Security "max-age=31536000" always;
+    try_files $uri @mastodon-packs;
+  }
+
   # Soapbox configuration files.
   # Enable CORS so we can fetch them.
   location /instance {