diff --git a/service/transport.go b/service/transport.go
index 97ce653..67b85a0 100644
--- a/service/transport.go
+++ b/service/transport.go
@@ -328,7 +328,7 @@ func NewHandler(s *service, verbose bool, staticDir string) http.Handler {
 			scheduledAt = string(scheduled.UTC().Format(time.RFC3339))
 		}
 		var pollOptions []string
-		for i := 0; i < 16; i++ {
+		for i := 0; i < 20; i++ {
 			v := c.r.FormValue(fmt.Sprintf("poll-option-%d", i))
 			if len(v) == 0 {
 				continue