diff --git a/changelog.d/17543.bugfix b/changelog.d/17543.bugfix
index 152b305e5..1dbb2a2f4 100644
--- a/changelog.d/17543.bugfix
+++ b/changelog.d/17543.bugfix
@@ -1 +1 @@
-Fix authenticated media responses using a wrong limit when following redirects over federation.
\ No newline at end of file
+Fix authenticated media responses using a wrong limit when following redirects over federation.
diff --git a/changelog.d/17626.bugfix b/changelog.d/17626.bugfix
new file mode 100644
index 000000000..1dbb2a2f4
--- /dev/null
+++ b/changelog.d/17626.bugfix
@@ -0,0 +1 @@
+Fix authenticated media responses using a wrong limit when following redirects over federation.
diff --git a/synapse/http/matrixfederationclient.py b/synapse/http/matrixfederationclient.py
index 12c41c39e..ecbbb6cfc 100644
--- a/synapse/http/matrixfederationclient.py
+++ b/synapse/http/matrixfederationclient.py
@@ -464,8 +464,6 @@ class MatrixFederationHttpClient:
         self.max_long_retries = hs.config.federation.max_long_retries
         self.max_short_retries = hs.config.federation.max_short_retries
 
-        self.max_download_size = hs.config.media.max_upload_size
-
         self._cooperator = Cooperator(scheduler=_make_scheduler(self.reactor))
 
         self._sleeper = AwakenableSleeper(self.reactor)
@@ -1759,9 +1757,9 @@ class MatrixFederationHttpClient:
                 str_url,
             )
             # We don't know how large the response will be upfront, so limit it to
-            # the `max_upload_size` config value.
+            # the `max_size` config value.
             length, headers, _, _ = await self._simple_http_client.get_file(
-                str_url, output_stream, self.max_download_size
+                str_url, output_stream, max_size
             )
 
         logger.info(