diff --git a/src/r0/message/create_message_event.rs b/src/r0/message/create_message_event.rs
index 850f5eaf..671265ac 100644
--- a/src/r0/message/create_message_event.rs
+++ b/src/r0/message/create_message_event.rs
@@ -41,7 +41,7 @@ ruma_api! {
 
     response {
         /// A unique identifier for the event.
-        pub event_id: Option<EventId>,
+        pub event_id: EventId,
     }
 
     error: crate::Error
diff --git a/src/r0/state/create_state_event_for_empty_key.rs b/src/r0/state/create_state_event_for_empty_key.rs
index c73543d8..6c5b980f 100644
--- a/src/r0/state/create_state_event_for_empty_key.rs
+++ b/src/r0/state/create_state_event_for_empty_key.rs
@@ -33,7 +33,7 @@ ruma_api! {
 
     response {
         /// A unique identifier for the event.
-        pub event_id: Option<EventId>,
+        pub event_id: EventId,
     }
 
     error: crate::Error
diff --git a/src/r0/state/create_state_event_for_key.rs b/src/r0/state/create_state_event_for_key.rs
index 0b3d1646..0754d72a 100644
--- a/src/r0/state/create_state_event_for_key.rs
+++ b/src/r0/state/create_state_event_for_key.rs
@@ -37,7 +37,7 @@ ruma_api! {
 
     response {
         /// A unique identifier for the event.
-        pub event_id: Option<EventId>,
+        pub event_id: EventId,
     }
 
     error: crate::Error