diff --git a/vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewModelTest.kt b/vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewModelTest.kt
index 456911e1e8..4381035b6f 100644
--- a/vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewModelTest.kt
@@ -25,6 +25,7 @@ import im.vector.app.features.poll.create.CreatePollViewStates.fakeQuestion
 import im.vector.app.features.poll.create.CreatePollViewStates.initialCreatePollViewState
 import im.vector.app.features.poll.create.CreatePollViewStates.pollViewStateWithOnlyQuestion
 import im.vector.app.features.poll.create.CreatePollViewStates.pollViewStateWithQuestionAndNotEnoughOptions
+import im.vector.app.features.poll.create.CreatePollViewStates.pollViewStateWithoutQuestionAndEnoughOptions
 import im.vector.app.test.fakes.FakeSession
 import im.vector.app.test.test
 import org.junit.Rule
@@ -79,4 +80,17 @@ class CreatePollViewModelTest {
                 .assertState(pollViewStateWithQuestionAndNotEnoughOptions)
                 .finish()
     }
+
+    @Test
+    fun `given there is not a question when enough options are added then poll cannot be created and options can be added`() {
+        val createPollViewModel = createPollViewModel(PollMode.CREATE)
+        repeat(CreatePollViewModel.MIN_OPTIONS_COUNT) {
+            createPollViewModel.handle(CreatePollAction.OnOptionChanged(it, fakeOptions[it]))
+        }
+
+        createPollViewModel
+                .test()
+                .assertState(pollViewStateWithoutQuestionAndEnoughOptions)
+                .finish()
+    }
 }