Merge remote-tracking branch 'origin/develop' into matrix-org-hotfixes

1 files changed, 3 insertions, 1 deletions

diff --git a/synapse/handlers/federation.py b/synapse/handlers/federation.py

index 9d867aaf4d..e8330a2b50 100644
--- a/synapse/handlers/federation.py
+++ b/synapse/handlers/federation.py
@@ -2446,7 +2446,9 @@ class FederationHandler(BaseHandler):
         # If we are going to send this event over federation we precaclculate
         # the joined hosts.
         if event.internal_metadata.get_send_on_behalf_of():
-            await self.event_creation_handler.cache_joined_hosts_for_event(event)
+            await self.event_creation_handler.cache_joined_hosts_for_event(
+                event, context
+            )
 
         return context