diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b13789179..f1eeb49fd2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1 +1 @@
-
+- MessagingMessageの型を修正
diff --git a/etc/misskey-js.api.md b/etc/misskey-js.api.md
index 5aacf2dbc1..362b73a99f 100644
--- a/etc/misskey-js.api.md
+++ b/etc/misskey-js.api.md
@@ -2171,7 +2171,10 @@ type MessagingMessage = {
     text: string | null;
     user: User;
     userId: User['id'];
-    groupId: string;
+    recipient?: User | null;
+    recipientId: User['id'] | null;
+    group?: UserGroup | null;
+    groupId: UserGroup['id'] | null;
 };
 
 // @public (undocumented)
diff --git a/src/entities.ts b/src/entities.ts
index dc4ff40a55..87c8134637 100644
--- a/src/entities.ts
+++ b/src/entities.ts
@@ -167,7 +167,10 @@ export type MessagingMessage = {
 	text: string | null;
 	user: User;
 	userId: User['id'];
-	groupId: string; // TODO
+	recipient?: User | null;
+	recipientId: User['id'] | null;
+	group?: UserGroup | null;
+	groupId: UserGroup['id'] | null;
 };
 
 export type CustomEmoji = {