diff --git a/src/database/rooms.rs b/src/database/rooms.rs
index 2246a61f..8e680330 100644
--- a/src/database/rooms.rs
+++ b/src/database/rooms.rs
@@ -812,6 +812,12 @@ impl Rooms {
             .expect("json is object")
             .remove("event_id");
 
+        // Add origin because synapse likes that (and it's required in the spec)
+        pdu_json
+            .as_object_mut()
+            .expect("json is object")
+            .insert("origin".to_owned(), globals.server_name().as_str().into());
+
         ruma::signatures::hash_and_sign_event(
             globals.server_name().as_str(),
             globals.keypair(),
diff --git a/src/database/sending.rs b/src/database/sending.rs
index 77998e79..a3f15742 100644
--- a/src/database/sending.rs
+++ b/src/database/sending.rs
@@ -42,6 +42,7 @@ impl Sending {
                             .get_mut("unsigned") {
                                 unsigned.as_object_mut().expect("unsigned is object").remove("transaction_id");
                         }
+
                         pdu_json
                             .as_object_mut()
                             .expect("json is object")