diff --git a/src/models/repositories/note.ts b/src/models/repositories/note.ts
index 7b46276930..e5bf8d3f3a 100644
--- a/src/models/repositories/note.ts
+++ b/src/models/repositories/note.ts
@@ -165,6 +165,7 @@ export class NoteRepository extends Repository<Note> {
 			renoteCount: note.renoteCount,
 			repliesCount: note.repliesCount,
 			reactions: note.reactions,
+			tags: note.tags.length > 0 ? note.tags : undefined,
 			emojis: reactionEmojis.length > 0 ? Emojis.find({
 				name: In(reactionEmojis),
 				host: host