diff --git a/changelog.d/17569.misc b/changelog.d/17569.misc
new file mode 100644
index 0000000000..cfa8089a81
--- /dev/null
+++ b/changelog.d/17569.misc
@@ -0,0 +1 @@
+Speed up responding to media requests.
diff --git a/synapse/media/_base.py b/synapse/media/_base.py
index fdbbe29472..9341d4859e 100644
--- a/synapse/media/_base.py
+++ b/synapse/media/_base.py
@@ -681,6 +681,9 @@ class ThreadedFileSender:
         """interfaces.IPushProducer"""
 
         # Unregister the consumer so we don't try and interact with it again.
+        if self.consumer:
+            self.consumer.unregisterProducer()
+
         self.consumer = None
 
         # Terminate the loop.