diff --git a/packages/client/src/components/MkNoteDetailed.vue b/packages/client/src/components/MkNoteDetailed.vue
index b3aee949ee..600a42494f 100644
--- a/packages/client/src/components/MkNoteDetailed.vue
+++ b/packages/client/src/components/MkNoteDetailed.vue
@@ -71,6 +71,7 @@
 			class="reply"
 			:conversation="replies"
 			:detailedView="true"
+			:parentId="appearNote.id"
 		/>
 		<MkLoading
 			v-else-if="tab === 'replies' && appearNote.repliesCount > 0"
@@ -84,6 +85,7 @@
 			class="reply"
 			:conversation="replies"
 			:detailedView="true"
+			:parentId="appearNote.id"
 		/>
 		<MkLoading v-else-if="tab === 'quotes' && directQuotes.length > 0" />
 
diff --git a/packages/client/src/components/MkNoteSub.vue b/packages/client/src/components/MkNoteSub.vue
index 37e14b3a4d..f98dfcb593 100644
--- a/packages/client/src/components/MkNoteSub.vue
+++ b/packages/client/src/components/MkNoteSub.vue
@@ -28,7 +28,7 @@
 					<MkSubNoteContent
 						class="text"
 						:note="note"
-						:parentId="appearNote.parentId"
+						:parentId="parentId"
 						:conversation="conversation"
 						@focusfooter="footerEl.focus()"
 					/>
@@ -140,7 +140,7 @@
 				:conversation="conversation"
 				:depth="replies.length == 1 ? depth : depth + 1"
 				:replyLevel="replyLevel + 1"
-				:parentId="appearNote.replyId"
+				:parentId="appearNote.id"
 				:detailedView="detailedView"
 			/>
 			<div v-else-if="replies.length > 0" class="more">
diff --git a/packages/client/src/components/MkSubNoteContent.vue b/packages/client/src/components/MkSubNoteContent.vue
index c7dc7dd7ff..cd908420a4 100644
--- a/packages/client/src/components/MkSubNoteContent.vue
+++ b/packages/client/src/components/MkSubNoteContent.vue
@@ -1,27 +1,26 @@
 <template>
 	<p v-if="note.cw != null" class="cw">
 		<MkA
-			v-if="!detailed && note.replyId"
-			:to="`#${note.replyId}`"
+			v-if="
+				conversation &&
+				note.renoteId == parentId
+			"
+			:to="`#${parentId}`"
 			behavior="browser"
 			class="reply-icon"
 			@click.stop
 		>
-			<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
+			<i class="ph-quotes ph-bold ph-lg"></i>
 		</MkA>
 		<MkA
-			v-if="
-				conversation &&
-				note.renoteId &&
-				note.renoteId != parentId &&
-				!note.replyId
-			"
-			:to="`/notes/${note.renoteId}`"
+			v-else-if="!detailed && note.replyId"
+			:to="`#${note.replyId}`"
+			behavior="browser"
 			v-tooltip="i18n.ts.jumpToPrevious"
 			class="reply-icon"
 			@click.stop
 		>
-			<i class="ph-quotes ph-bold ph-lg"></i>
+			<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
 		</MkA>
 		<Mfm
 			v-if="note.cw != ''"
@@ -68,7 +67,19 @@
 				>
 				<template v-if="!note.cw">
 					<MkA
-						v-if="!detailed && note.replyId"
+						v-if="
+							conversation &&
+							note.renoteId == parentId
+						"
+						:to="`#${parentId}`"
+						behavior="browser"
+						class="reply-icon"
+						@click.stop
+					>
+						<i class="ph-quotes ph-bold ph-lg"></i>
+					</MkA>
+					<MkA
+						v-else-if="!detailed && note.replyId"
 						:to="`#${note.replyId}`"
 						behavior="browser"
 						v-tooltip="i18n.ts.jumpToPrevious"
@@ -77,19 +88,6 @@
 					>
 						<i class="ph-arrow-bend-left-up ph-bold ph-lg"></i>
 					</MkA>
-					<MkA
-						v-if="
-							conversation &&
-							note.renoteId &&
-							note.renoteId != parentId &&
-							!note.replyId
-						"
-						:to="`/notes/${note.renoteId}`"
-						class="reply-icon"
-						@click.stop
-					>
-						<i class="ph-quotes ph-bold ph-lg"></i>
-					</MkA>
 				</template>
 				<Mfm
 					v-if="note.text"