diff --git a/components/status/StatusContent.vue b/components/status/StatusContent.vue
index 262d7887..98f15c2e 100644
--- a/components/status/StatusContent.vue
+++ b/components/status/StatusContent.vue
@@ -34,10 +34,7 @@ const isFiltered = $computed(() => filterPhrase && (context && context !== 'deta
         <p>{{ status.spoilerText || `${$t('status.filter_hidden_phrase')}: ${filterPhrase}` }}</p>
       </template>
       <StatusBody :status="status" :with-action="!isDetails" :class="isDetails ? 'text-xl' : ''" />
-      <StatusPoll
-        v-if="status.poll"
-        :poll="status.poll"
-      />
+      <StatusPoll v-if="status.poll" :status="status" />
       <StatusMedia
         v-if="status.mediaAttachments?.length"
         :status="status"
diff --git a/components/status/StatusPoll.vue b/components/status/StatusPoll.vue
index 611f9489..6151ac1f 100644
--- a/components/status/StatusPoll.vue
+++ b/components/status/StatusPoll.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
-import type { Poll } from 'masto'
+import type { Status } from 'masto'
 
-const { poll: _poll } = defineProps<{
-  poll: Poll
+const { status } = defineProps<{
+  status: Status
 }>()
-const poll = reactive({ ..._poll })
+const poll = reactive({ ...status.poll! })
 
 function toPercentage(num: number) {
   const percentage = 100 * num
@@ -19,7 +19,6 @@ const masto = useMasto()
 async function vote(e: Event) {
   const formData = new FormData(e.target as HTMLFormElement)
   const choices = formData.getAll('choices') as string[]
-  await masto.poll.vote(poll.id, { choices })
 
   // Update the poll optimistically
   for (const [index, option] of poll.options.entries()) {
@@ -29,6 +28,9 @@ async function vote(e: Event) {
   poll.voted = true
   poll.votesCount++
   poll.votersCount = (poll.votersCount || 0) + 1
+  cacheStatus({ ...status, poll }, undefined, true)
+
+  await masto.poll.vote(poll.id, { choices })
 }
 </script>