diff --git a/src/message/mod.rs b/src/message/mod.rs
index 4308f1f..19bd6dc 100644
--- a/src/message/mod.rs
+++ b/src/message/mod.rs
@@ -5,7 +5,9 @@ use serde::{Deserialize, Serialize};
 
 #[derive(Clone, Debug, Default, Deserialize, Serialize, utoipa::ToSchema)]
 pub struct Message {
-    pub id: uuid::Uuid,
+    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
+    pub id: Option<uuid::Uuid>,
     pub content: String,
-    pub user_id: uuid::Uuid,
+    #[serde(skip_serializing_if = "crate::init::is_uuid_nil")]
+    pub user_id: Option<uuid::Uuid>,
 }