diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/polls/PollQuestionViewHolder.kt b/room-kit/src/main/java/live/hms/roomkit/ui/polls/PollQuestionViewHolder.kt
index f5af7ad67..076c8c1ba 100644
--- a/room-kit/src/main/java/live/hms/roomkit/ui/polls/PollQuestionViewHolder.kt
+++ b/room-kit/src/main/java/live/hms/roomkit/ui/polls/PollQuestionViewHolder.kt
@@ -101,9 +101,6 @@ class PollQuestionViewHolder<T : ViewBinding>(
     private fun bind(questionUi: QuestionUi.QuestionCreator) {
         with(binding as LayoutPollQuestionCreationItemBinding) {
             binding.applyTheme()
-            notRequiredToAnswer.setOnCheckedChangeListener { _, b ->
-                getItem(bindingAdapterPosition).currentQuestion.requiredToAnswer = b
-            }
             binding.askAQuestionEditText.setText(questionUi.currentQuestion.withTitle)
             binding.askAQuestionEditText.addTextChangedListener(object : TextWatcher {
                 override fun beforeTextChanged(p0: CharSequence?, p1: Int, p2: Int, p3: Int) {
diff --git a/room-kit/src/main/java/live/hms/roomkit/ui/theme/ThemeExt.kt b/room-kit/src/main/java/live/hms/roomkit/ui/theme/ThemeExt.kt
index 22874242c..49cc20164 100644
--- a/room-kit/src/main/java/live/hms/roomkit/ui/theme/ThemeExt.kt
+++ b/room-kit/src/main/java/live/hms/roomkit/ui/theme/ThemeExt.kt
@@ -2528,8 +2528,6 @@ fun LayoutPollQuestionCreationItemBinding.applyTheme() {
     )
     )
 
-    setSwitchThemes(notRequiredToAnswer)
-
     saveButton.saveButtonEnabled()
 
 
diff --git a/room-kit/src/main/res/layout/layout_poll_question_creation_item.xml b/room-kit/src/main/res/layout/layout_poll_question_creation_item.xml
index b2987ac66..b79fe74ec 100644
--- a/room-kit/src/main/res/layout/layout_poll_question_creation_item.xml
+++ b/room-kit/src/main/res/layout/layout_poll_question_creation_item.xml
@@ -124,28 +124,17 @@
             android:textSize="14sp"
             android:fontFamily="@font/inter_regular"
             android:lineHeight="20sp"
-            app:layout_constraintBottom_toTopOf="@id/notRequiredToAnswer"
+            app:layout_constraintBottom_toTopOf="@id/border"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/optionsListRadioGroupVG" />
 
-        <com.google.android.material.switchmaterial.SwitchMaterial
-            android:id="@+id/notRequiredToAnswer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Not required to answer"
-            app:layout_constraintBottom_toTopOf="@+id/border"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/addAnOptionTextView"
-            tools:visibility="visible" />
-
         <View
             android:id="@+id/border"
             android:layout_width="match_parent"
             android:layout_height="0.5px"
             app:layout_constraintBottom_toTopOf="@id/saveButton"
-            app:layout_constraintTop_toBottomOf="@id/notRequiredToAnswer"
+            app:layout_constraintTop_toBottomOf="@id/addAnOptionTextView"
             android:layout_marginVertical="@dimen/spacing_d1"
             android:background="@drawable/gray_line_vertical_divider" />