diff --git a/src/server/api/endpoints/notes/create.ts b/src/server/api/endpoints/notes/create.ts
index 423adc38e..aa3b4a395 100644
--- a/src/server/api/endpoints/notes/create.ts
+++ b/src/server/api/endpoints/notes/create.ts
@@ -306,6 +306,10 @@ export default define(meta, async (ps, user) => {
 		throw new ApiError(meta.errors.contentRequired);
 	}
 
+	if (renote && !(ps.text || files.length || ps.poll) && (ps.cw || reply)) {
+		throw new ApiError(meta.errors.contentRequired);
+	}
+
 	let channel: Channel | undefined;
 	if (ps.channelId != null) {
 		channel = await Channels.findOne(ps.channelId);