diff --git a/src/server/activitypub/outbox.ts b/src/server/activitypub/outbox.ts
index e441e3dc4e..91473b77e3 100644
--- a/src/server/activitypub/outbox.ts
+++ b/src/server/activitypub/outbox.ts
@@ -51,8 +51,15 @@ export default async (ctx: Koa.Context) => {
 
 		const query = {
 			userId: user._id,
-			$or: [ { visibility: 'public' }, { visibility: 'home' } ],
-			text: { $ne: null }	// exclude renote, but include quote
+			$and: [{
+				$or: [ { visibility: 'public' }, { visibility: 'home' } ]
+			}, { // exclude renote, but include quote
+				$or: [{
+					text: { $ne: null }
+				}, {
+					mediaIds: { $ne: [] }
+				}]
+			}]
 		} as any;
 
 		if (sinceId) {