diff --git a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
index 63a61a8b3f..87d1641638 100644
--- a/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt
@@ -504,7 +504,7 @@ class DefaultNavigator @Inject constructor(
     override fun openCreatePoll(context: Context, roomId: String) {
         val intent = CreatePollActivity.getIntent(
                 context,
-                CreatePollArgs(roomId = roomId, minOptionsCount = CreatePollViewModel.MIN_OPTIONS_COUNT)
+                CreatePollArgs(roomId = roomId)
         )
         context.startActivity(intent)
     }
diff --git a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollFragment.kt b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollFragment.kt
index 50854a3740..95b3282aee 100644
--- a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollFragment.kt
@@ -34,7 +34,6 @@ import javax.inject.Inject
 @Parcelize
 data class CreatePollArgs(
         val roomId: String,
-        val minOptionsCount: Int
 ) : Parcelable
 
 class CreatePollFragment @Inject constructor(
diff --git a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewState.kt b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewState.kt
index ca2ddc3b47..7910a1dd6c 100644
--- a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewState.kt
+++ b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollViewState.kt
@@ -21,14 +21,13 @@ import com.airbnb.mvrx.MavericksState
 data class CreatePollViewState(
         val roomId: String,
         val question: String = "",
-        val options: List<String> = emptyList(),
+        val options: List<String> = List(CreatePollViewModel.MIN_OPTIONS_COUNT) { "" },
         val canCreatePoll: Boolean = false,
         val canAddMoreOptions: Boolean = true
 ) : MavericksState {
 
     constructor(args: CreatePollArgs) : this(
-            roomId = args.roomId,
-            options = List(args.minOptionsCount) { "" }
+            roomId = args.roomId
     )
 }