diff --git a/.env.production.sample b/.env.production.sample
index 04a5d71a6..9f85cb288 100644
--- a/.env.production.sample
+++ b/.env.production.sample
@@ -91,4 +91,9 @@ SESSION_RETENTION_PERIOD=31556952
 
 # Max status length limit
 # Maximum allowed character count of one status
-# MAX_STATUS_CHARS=500
\ No newline at end of file
+# MAX_STATUS_CHARS=500
+
+
+# Max poll option limit
+# Maximum allowed poll option number
+# MAX_POLL_OPTIONS=16
\ No newline at end of file
diff --git a/app/validators/poll_options_validator.rb b/app/validators/poll_options_validator.rb
index fd29fc1b4..030c4a33c 100644
--- a/app/validators/poll_options_validator.rb
+++ b/app/validators/poll_options_validator.rb
@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class PollOptionsValidator < ActiveModel::Validator
-  MAX_OPTIONS      = 4
+  MAX_OPTIONS      = (ENV['MAX_POLL_OPTIONS'] || 4).to_i
   MAX_OPTION_CHARS = 50
 
   def validate(poll)