1 files changed, 3 insertions, 1 deletions
diff --git a/synapse/federation/sender/transaction_manager.py b/synapse/federation/sender/transaction_manager.py
index 42f46394bc..5b6c79c51a 100644
--- a/synapse/federation/sender/transaction_manager.py
+++ b/synapse/federation/sender/transaction_manager.py
@@ -64,7 +64,9 @@ class TransactionManager(object):
         keep_destination = whitelisted_homeserver(destination)
 
         for edu in pending_edus:
-            span_contexts.append(extract_text_map(json.loads(edu.get_context())))
+            context = edu.get_context()
+            if context:
+                span_contexts.append(extract_text_map(json.loads(context)))
             if keep_destination:
                 edu.strip_context()