diff --git a/packages/frontend/src/components/MkSubNoteContent.vue b/packages/frontend/src/components/MkSubNoteContent.vue
index 5fb37ce8dc..138df3320c 100644
--- a/packages/frontend/src/components/MkSubNoteContent.vue
+++ b/packages/frontend/src/components/MkSubNoteContent.vue
@@ -18,7 +18,14 @@ SPDX-License-Identifier: AGPL-3.0-only
 	</details>
 	<details v-if="note.poll">
 		<summary>{{ i18n.ts.poll }}</summary>
-		<MkPoll :noteId="note.id" :poll="note.poll" :author="note.user" :emojiUrls="note.emojis"/>
+		<MkPoll
+			:noteId="note.id"
+			:multiple="note.poll.multiple"
+			:expiresAt="note.poll.expiresAt"
+			:choices="note.poll.choices"
+			:author="note.user"
+			:emojiUrls="note.emojis"
+		/>
 	</details>
 	<button v-if="isLong && collapsed" :class="$style.fade" class="_button" @click="collapsed = false">
 		<span :class="$style.fadeLabel">{{ i18n.ts.showMore }}</span>
diff --git a/packages/frontend/src/pages/welcome.timeline.note.vue b/packages/frontend/src/pages/welcome.timeline.note.vue
index 62a220d2f1..b4a24637c9 100644
--- a/packages/frontend/src/pages/welcome.timeline.note.vue
+++ b/packages/frontend/src/pages/welcome.timeline.note.vue
@@ -23,9 +23,6 @@ SPDX-License-Identifier: AGPL-3.0-only
 		<div v-if="note.files && note.files.length > 0" :class="$style.richcontent">
 			<MkMediaList :mediaList="note.files.slice(0, 4)"/>
 		</div>
-		<div v-if="note.poll">
-			<MkPoll :noteId="note.id" :poll="note.poll" :readOnly="true"/>
-		</div>
 		<div v-if="note.reactionCount > 0" :class="$style.reactions">
 			<!-- TODO -->
 			<!--<MkReactionsViewer :note="note" :maxNumber="16"/>-->