diff --git a/src/activitypub/routes/channel/#channel_id/messages/#message_id/index.ts b/src/activitypub/routes/channel/#channel_id/messages/#message_id/index.ts
index de498847f..87bec308c 100644
--- a/src/activitypub/routes/channel/#channel_id/messages/#message_id/index.ts
+++ b/src/activitypub/routes/channel/#channel_id/messages/#message_id/index.ts
@@ -21,7 +21,7 @@ router.get("/", route({}), async (req: Request, res: Response) => {
 		type: "Announce",
 		actor: `https://${webDomain}/fed/user/${message.author_id}`,
 		published: message.timestamp,
-		to: `https://${webDomain}/fed/channel/${message.channel_id}/followers`,
+		to: ["https://www.w3.org/ns/activitystreams#Public"], // TODO
 		object: message.toAP(),
 	};
 
diff --git a/src/util/entities/Message.ts b/src/util/entities/Message.ts
index 32bd715e6..07ec81959 100644
--- a/src/util/entities/Message.ts
+++ b/src/util/entities/Message.ts
@@ -251,7 +251,7 @@ export class Message extends BaseClass {
 			type: "Announce",
 			actor: `https://${webDomain}/fed/user/${this.author_id}`,
 			published: this.timestamp,
-			to: `https://${webDomain}/fed/channel/${this.channel_id}`,
+			to: ["https://www.w3.org/ns/activitystreams#Public"],
 			object: this.toAP(),
 		};
 	}
@@ -265,7 +265,7 @@ export class Message extends BaseClass {
 			published: this.timestamp,
 			url: `https://${webDomain}/fed/messages/${this.id}`,
 			attributedTo: `https://${webDomain}/fed/user/${this.author_id}`,
-			to: `https://${webDomain}/fed/channel/${this.channel_id}/followers`,
+			to: ["https://www.w3.org/ns/activitystreams#Public"],
 			content: this.content,
 		};
 	}