diff --git a/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/AddPollDialog.kt b/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/AddPollDialog.kt
index 35dc7a192..2d76e2d03 100644
--- a/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/AddPollDialog.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/components/compose/dialog/AddPollDialog.kt
@@ -75,8 +75,10 @@ fun showAddPollDialog(
         }
     }
 
+    val DAY_SECONDS = 60 * 60 * 24
+    val desiredDuration = poll?.expiresIn ?: DAY_SECONDS
     val pollDurationId = durations.indexOfLast {
-        it <= (poll?.expiresIn ?: 0)
+        it <= desiredDuration
     }
 
     binding.pollDurationSpinner.setSelection(pollDurationId)