diff --git a/packages/backend/src/server/api/endpoints/notes/edit.ts b/packages/backend/src/server/api/endpoints/notes/edit.ts
index 90a4f4ded1..511ea618cc 100644
--- a/packages/backend/src/server/api/endpoints/notes/edit.ts
+++ b/packages/backend/src/server/api/endpoints/notes/edit.ts
@@ -527,9 +527,12 @@ export default define(meta, paramDef, async (ps, user) => {
 	if (ps.text !== note.text) {
 		update.text = ps.text;
 	}
-	if (ps.cw !== note.cw) {
+	if (ps.cw !== note.cw || (ps.cw && !note.cw)) {
 		update.cw = ps.cw;
 	}
+	else if (!ps.cw && note.cw) {
+		update.cw = null;
+	}
 	if (ps.visibility !== note.visibility) {
 		update.visibility = ps.visibility;
 	}