1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/federation/transaction_queue.py b/synapse/federation/transaction_queue.py
index 30941f5ad6..2969c83ac5 100644
--- a/synapse/federation/transaction_queue.py
+++ b/synapse/federation/transaction_queue.py
@@ -380,7 +380,9 @@ class TransactionQueue(object):
         else:
             self.pending_edus_by_dest.setdefault(destination, []).append(edu)
 
-        self._attempt_new_transaction(destination)
+        # this is a bit of a hack, but we delay starting the transmission loop
+        # in an effort to batch up outgoing EDUs a bit.
+        self.clock.call_later(5.0, self._attempt_new_transaction, destination)
 
     def send_device_messages(self, destination):
         if destination == self.server_name: