diff --git a/src/repo/message/event.rs b/src/repo/message/event.rs
index 31eb864..d14722f 100644
--- a/src/repo/message/event.rs
+++ b/src/repo/message/event.rs
@@ -96,7 +96,12 @@ async fn parse_row(
     let contact_id: uuid::Uuid = row.try_get("contact_id")?;
     let message_id: uuid::Uuid = row.try_get("message_id")?;
     let sent: time::OffsetDateTime = row.try_get("sent")?;
-    let scheduled_message_event_id: uuid::Uuid = row.try_get("scheduled_message_event_id")?;
+    let scheduled_message_event_id: Option<uuid::Uuid> = match row.try_get("scheduled_message_event_id") {
+        Ok(id) => id,
+        Err(_err) => {
+            None
+        }
+    };
     let user_id: uuid::Uuid = row.try_get("user_id")?;
 
     Ok(textsender_models::message::event::MessageEventResponse {
@@ -106,7 +111,7 @@ async fn parse_row(
         message_id,
         status,
         sent: Some(sent),
-        scheduled_message_event_id: Some(scheduled_message_event_id),
+        scheduled_message_event_id: scheduled_message_event_id,
         user_id,
     })
 }