From 1892ba5f67fa17685ff036f85939396e075bac4a Mon Sep 17 00:00:00 2001
From: Erik Johnston <erikj@element.io>
Date: Wed, 14 Aug 2024 13:46:22 +0100
Subject: [PATCH] Fix 'Producer was not unregistered' error (#17569)

Follows on from #17567
---
 changelog.d/17569.misc | 1 +
 synapse/media/_base.py | 3 +++
 2 files changed, 4 insertions(+)
 create mode 100644 changelog.d/17569.misc

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.