diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormModels.swift b/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormModels.swift
index f8929bc38c..346ba3d579 100644
--- a/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormModels.swift
+++ b/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormModels.swift
@@ -81,13 +81,14 @@ struct PollEditFormAnswerOption: Identifiable, Equatable {
 }
 
 struct PollEditFormViewState: BindableState {
+    var minAnswerOptionsCount: Int
     var maxAnswerOptionsCount: Int
     var mode: PollEditFormMode
     var bindings: PollEditFormViewStateBindings
     
     var confirmationButtonEnabled: Bool {
         !bindings.question.text.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty &&
-            bindings.answerOptions.filter({ !$0.text.isEmpty }).count >= 2
+            bindings.answerOptions.filter({ !$0.text.isEmpty }).count >= minAnswerOptionsCount
     }
     
     var addAnswerOptionButtonEnabled: Bool {
diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormViewModel.swift b/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormViewModel.swift
index 63761a53a8..3672fbb94d 100644
--- a/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormViewModel.swift
+++ b/RiotSwiftUI/Modules/Room/PollEditForm/PollEditFormViewModel.swift
@@ -30,6 +30,7 @@ typealias PollEditFormViewModelType = StateStoreViewModel< PollEditFormViewState
 class PollEditFormViewModel: PollEditFormViewModelType {
     
     private struct Constants {
+        static let minAnswerOptionsCount = 2
         static let maxAnswerOptionsCount = 20
         static let maxQuestionLength = 340
         static let maxAnswerOptionLength = 340
@@ -47,6 +48,7 @@ class PollEditFormViewModel: PollEditFormViewModelType {
     
     init(parameters: PollEditFormViewModelParameters) {
         let state = PollEditFormViewState(
+            minAnswerOptionsCount: Constants.minAnswerOptionsCount,
             maxAnswerOptionsCount: Constants.maxAnswerOptionsCount,
             mode: parameters.mode,
             bindings: PollEditFormViewStateBindings(