diff --git a/packages/backend/src/misc/get-note-summary.ts b/packages/backend/src/misc/get-note-summary.ts
index 1a07139a5..3d6637242 100644
--- a/packages/backend/src/misc/get-note-summary.ts
+++ b/packages/backend/src/misc/get-note-summary.ts
@@ -22,8 +22,8 @@ export const getNoteSummary = (note: Packed<'Note'>): string => {
 
 	// 本文
 	if (note.cw != null) {
-		summary += note.cw;
-	} else {
+		summary += `CW: ${note.cw}`;
+	} else if (note.text) {
 		summary += note.text ? note.text : '';
 	}
 
@@ -39,7 +39,7 @@ export const getNoteSummary = (note: Packed<'Note'>): string => {
 
 	// 返信のとき
 	if (note.replyId) {
-		if (note.reply) {
+		if (note.reply && !note.cw) {
 			summary += `\n\nRE: ${getNoteSummary(note.reply)}`;
 		} else {
 			summary += '\n\nRE: ...';
@@ -48,7 +48,7 @@ export const getNoteSummary = (note: Packed<'Note'>): string => {
 
 	// Renoteのとき
 	if (note.renoteId) {
-		if (note.renote) {
+		if (note.renote && !note.cw) {
 			summary += `\n\nRN: ${getNoteSummary(note.renote)}`;
 		} else {
 			summary += '\n\nRN: ...';