diff --git a/src/database/entities/channel.rs b/src/database/entities/channel.rs
index a1ba6c4a..a0c7ed1f 100644
--- a/src/database/entities/channel.rs
+++ b/src/database/entities/channel.rs
@@ -13,14 +13,6 @@ use mongodb::{
 use rocket::serde::json::Value;
 use serde::{Deserialize, Serialize};
 
-#[derive(Serialize, Deserialize, Debug, Clone)]
-pub struct LastMessage {
-    #[serde(rename = "_id")]
-    id: String,
-    author: String,
-    short: String,
-}
-
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(tag = "channel_type")]
 pub enum Channel {
@@ -36,7 +28,7 @@ pub enum Channel {
         active: bool,
         recipients: Vec<String>,
         #[serde(skip_serializing_if = "Option::is_none")]
-        last_message: Option<LastMessage>,
+        last_message_id: Option<String>,
     },
     Group {
         #[serde(rename = "_id")]
@@ -53,7 +45,7 @@ pub enum Channel {
         #[serde(skip_serializing_if = "Option::is_none")]
         icon: Option<File>,
         #[serde(skip_serializing_if = "Option::is_none")]
-        last_message: Option<LastMessage>,
+        last_message_id: Option<String>,
 
         #[serde(skip_serializing_if = "Option::is_none")]
         permissions: Option<i32>,
@@ -75,7 +67,7 @@ pub enum Channel {
         #[serde(skip_serializing_if = "Option::is_none")]
         icon: Option<File>,
         #[serde(skip_serializing_if = "Option::is_none")]
-        last_message: Option<String>,
+        last_message_id: Option<String>,
 
         #[serde(skip_serializing_if = "Option::is_none")]
         default_permissions: Option<i32>,
diff --git a/src/routes/channels/group_create.rs b/src/routes/channels/group_create.rs
index 7d0ce530..d70ebb05 100644
--- a/src/routes/channels/group_create.rs
+++ b/src/routes/channels/group_create.rs
@@ -78,7 +78,7 @@ pub async fn req(user: User, info: Json<Data>) -> Result<Value> {
         owner: user.id,
         recipients: set.into_iter().collect::<Vec<String>>(),
         icon: None,
-        last_message: None,
+        last_message_id: None,
         permissions: None,
         nsfw: info.nsfw.unwrap_or_default()
     };
diff --git a/src/routes/servers/channel_create.rs b/src/routes/servers/channel_create.rs
index 12520ed5..abfc4207 100644
--- a/src/routes/servers/channel_create.rs
+++ b/src/routes/servers/channel_create.rs
@@ -79,7 +79,7 @@ pub async fn req(user: User, target: Ref, info: Json<Data>) -> Result<Value> {
             name: info.name,
             description: info.description,
             icon: None,
-            last_message: None,
+            last_message_id: None,
 
             default_permissions: None,
             role_permissions: HashMap::new(),
diff --git a/src/routes/servers/server_create.rs b/src/routes/servers/server_create.rs
index 88c664ae..194b60a2 100644
--- a/src/routes/servers/server_create.rs
+++ b/src/routes/servers/server_create.rs
@@ -88,7 +88,7 @@ pub async fn req(user: User, info: Json<Data>) -> Result<Value> {
         description: None,
 
         icon: None,
-        last_message: None,
+        last_message_id: None,
 
         default_permissions: None,
         role_permissions: HashMap::new(),
diff --git a/src/routes/users/open_dm.rs b/src/routes/users/open_dm.rs
index 64bef6a2..18072ab1 100644
--- a/src/routes/users/open_dm.rs
+++ b/src/routes/users/open_dm.rs
@@ -40,7 +40,7 @@ pub async fn req(user: User, target: Ref) -> Result<Value> {
                 id,
                 active: false,
                 recipients: vec![user.id, target.id],
-                last_message: None,
+                last_message_id: None,
             }
         };