1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/federation/units.py b/synapse/federation/units.py
index 6b329f26b4..308760d9b5 100644
--- a/synapse/federation/units.py
+++ b/synapse/federation/units.py
@@ -116,8 +116,11 @@ class Transaction(JsonEncodedObject):
 
 
 def _mangle_pdu(pdu_json):
+    pdu_json.pop("origin", None)
     pdu_json.pop("hashes", None)
     pdu_json.pop("signatures", None)
+    pdu_json.get("unsigned", {}).pop("age_ts", None)
+    pdu_json.get("unsigned", {}).pop("age", None)
 
     pdu_json["auth_events"] = list(_strip_hashes(pdu_json["auth_events"]))
     pdu_json["prev_events"] = list(_strip_hashes(pdu_json["prev_events"]))
@@ -129,6 +132,5 @@ def _mangle_pdu(pdu_json):
 
 def _strip_hashes(iterable):
     return (
-        (e, {})
-        for e, hashes in iterable
+        e for e, hashes in iterable
     )