diff --git a/packages/backend/src/misc/is-user-related.ts b/packages/backend/src/misc/is-user-related.ts
index ae8f4116c..6efb1194d 100644
--- a/packages/backend/src/misc/is-user-related.ts
+++ b/packages/backend/src/misc/is-user-related.ts
@@ -8,11 +8,11 @@ export function isUserRelated(note: any, userIds: Set<string>, ignoreAuthor = fa
 		return true;
 	}
 
-	if (note.reply != null && userIds.has(note.reply.userId)) {
+	if (note.reply != null && note.reply.userId !== note.userId && userIds.has(note.reply.userId)) {
 		return true;
 	}
 
-	if (note.renote != null && userIds.has(note.renote.userId)) {
+	if (note.renote != null && note.renote.userId !== note.userId && userIds.has(note.renote.userId)) {
 		return true;
 	}
 
diff --git a/packages/backend/test/e2e/timelines.ts b/packages/backend/test/e2e/timelines.ts
index d606c6729..a82be6365 100644
--- a/packages/backend/test/e2e/timelines.ts
+++ b/packages/backend/test/e2e/timelines.ts
@@ -856,13 +856,17 @@ describe('Timelines', () => {
 
 			await api('/mute/create', { userId: bob.id }, alice);
 			await sleep(1000);
-			const bobNote = await post(bob, { text: 'hi' });
+			const bobNote1 = await post(bob, { text: 'hi' });
+			const bobNote2 = await post(bob, { text: 'hi', replyId: bobNote1.id });
+			const bobNote3 = await post(bob, { text: 'hi', renoteId: bobNote1.id });
 
 			await waitForPushToTl();
 
 			const res = await api('/users/notes', { userId: bob.id }, alice);
 
-			assert.strictEqual(res.body.some((note: any) => note.id === bobNote.id), true);
+			assert.strictEqual(res.body.some((note: any) => note.id === bobNote1.id), true);
+			assert.strictEqual(res.body.some((note: any) => note.id === bobNote2.id), true);
+			assert.strictEqual(res.body.some((note: any) => note.id === bobNote3.id), true);
 		});
 	});