diff --git a/CHANGELOG.md b/CHANGELOG.md
index be2ac6be1e..8e3bdbfe99 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@
 
 ### Client
 - Fix: アプリ内からキャッシュをクリアするとテーマ再適用するまでレンダリングが正しく行われない問題を修正
+- Fix: 期限が無期限のアンケートに投票できない問題を修正
 
 ### Server
 -
diff --git a/packages/frontend/src/components/MkPoll.vue b/packages/frontend/src/components/MkPoll.vue
index 9fc9c98493..305e9b5c4f 100644
--- a/packages/frontend/src/components/MkPoll.vue
+++ b/packages/frontend/src/components/MkPoll.vue
@@ -58,7 +58,7 @@ const remaining = computed(() => {
 });
 
 const total = computed(() => sum(props.choices.map(x => x.votes)));
-const closed = computed(() => remaining.value <= 0);
+const closed = computed(() => props.expiresAt != null && remaining.value <= 0);
 const isVoted = computed(() => !props.multiple && props.choices.some(c => c.isVoted));
 const timer = computed(() => i18n.tsx._poll[
 	remaining.value >= 86400 ? 'remainingDays' :