diff --git a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts
index 27c42cb3..95c995de 100644
--- a/src/api/routes/channels/#channel_id/messages/#message_id/index.ts
+++ b/src/api/routes/channels/#channel_id/messages/#message_id/index.ts
@@ -133,7 +133,7 @@ router.patch(
 			mentions: new_message.embeds,
 			mention_roles: new_message.mention_roles,
 			mention_everyone: new_message.mention_everyone,
-			pinned: new_message.pinned_at != null,
+			pinned: new_message.pinned,
 			timestamp: new_message.timestamp,
 			edited_timestamp: new_message.edited_timestamp,
 
diff --git a/src/api/routes/guilds/#guild_id/messages/search.ts b/src/api/routes/guilds/#guild_id/messages/search.ts
index 91311b6a..94adf9c6 100644
--- a/src/api/routes/guilds/#guild_id/messages/search.ts
+++ b/src/api/routes/guilds/#guild_id/messages/search.ts
@@ -155,7 +155,7 @@ router.get(
 				embeds: x.embeds,
 				mentions: x.mentions,
 				mention_roles: x.mention_roles,
-				pinned: x.pinned_at != null,
+				pinned: x.pinned,
 				mention_everyone: x.mention_everyone,
 				tts: x.tts,
 				timestamp: x.timestamp,
diff --git a/src/util/entities/Message.ts b/src/util/entities/Message.ts
index 6a9c430c..de1caad9 100644
--- a/src/util/entities/Message.ts
+++ b/src/util/entities/Message.ts
@@ -188,6 +188,10 @@ export class Message extends BaseClass {
 	@Column({ type: "timestamp", nullable: true })
 	pinned_at: Date | null;
 
+	get pinned(): boolean {
+		return this.pinned_at != null;
+	}
+
 	@Column({ type: "int" })
 	type: MessageType;
 
@@ -259,6 +263,7 @@ export class Message extends BaseClass {
 			components: this.components ?? undefined,
 			poll: this.poll ?? undefined,
 			content: this.content ?? "",
+			pinned: this.pinned,
 		};
 	}