diff --git a/bundles/matrix-synapse/metadata.py b/bundles/matrix-synapse/metadata.py
index d0cb15e..7af43f0 100644
--- a/bundles/matrix-synapse/metadata.py
+++ b/bundles/matrix-synapse/metadata.py
@@ -144,13 +144,14 @@ def nginx(metadata):
     }
 
     if node.has_bundle('matrix-media-repo'):
-        locations['/_matrix/media'] = {
-            'target': 'http://localhost:20090',
-            'max_body_size': '{}M'.format(metadata.get('matrix-media-repo/upload_max_mb')),
-            # matrix-media-repo needs this to be the
-            # homeserver address.
-            'x_forwarded_host': metadata.get('matrix-synapse/server_name'),
-        }
+        for path in ('/_matrix/media', '/_matrix/client/v1/media', '/_matrix/federation/v1/media'):
+            locations[path] = {
+                'target': 'http://localhost:20090',
+                'max_body_size': '{}M'.format(metadata.get('matrix-media-repo/upload_max_mb')),
+                # matrix-media-repo needs this to be the
+                # homeserver address.
+                'x_forwarded_host': metadata.get('matrix-synapse/server_name'),
+            }
 
     vhosts = {
         'matrix-synapse': {