diff --git a/Tusker/Screens/Compose/ComposePollView.swift b/Tusker/Screens/Compose/ComposePollView.swift
index 2158a8a6..87f5efb4 100644
--- a/Tusker/Screens/Compose/ComposePollView.swift
+++ b/Tusker/Screens/Compose/ComposePollView.swift
@@ -22,11 +22,7 @@ struct ComposePollView: View {
     
     @Environment(\.colorScheme) var colorScheme: ColorScheme
     
-    @State private var duration: Duration {
-        didSet {
-            poll.duration = duration.timeInterval
-        }
-    }
+    @State private var duration: Duration
     
     init(draft: Draft, poll: Draft.Poll) {
         self.draft = draft
@@ -84,6 +80,9 @@ struct ComposePollView: View {
             backgroundColor
                 .cornerRadius(10)
         )
+        .onChange(of: duration, perform: { (value) in
+            poll.duration = value.timeInterval
+        })
     }
     
     private var backgroundColor: Color {