diff --git a/changelog.d/5178.bugfix b/changelog.d/5178.bugfix
new file mode 100644
index 0000000000..73021a0485
--- /dev/null
+++ b/changelog.d/5178.bugfix
@@ -0,0 +1 @@
+Remove redundant highlight on add poll option button
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt b/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt
index fe59c82ce9..d4838289a6 100644
--- a/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt
+++ b/vector/src/main/java/im/vector/app/core/ui/list/GenericButtonItem.kt
@@ -19,6 +19,7 @@ import android.graphics.Typeface
 import android.view.Gravity
 import androidx.annotation.ColorInt
 import androidx.annotation.DrawableRes
+import androidx.core.content.ContextCompat
 import com.airbnb.epoxy.EpoxyAttribute
 import com.airbnb.epoxy.EpoxyModelClass
 import com.google.android.material.button.MaterialButton
@@ -55,6 +56,9 @@ abstract class GenericButtonItem : VectorEpoxyModel<GenericButtonItem.Holder>()
     @EpoxyAttribute
     var bold: Boolean = false
 
+    @EpoxyAttribute
+    var highlight: Boolean = true
+
     override fun bind(holder: Holder) {
         super.bind(holder)
         holder.button.text = text
@@ -70,6 +74,12 @@ abstract class GenericButtonItem : VectorEpoxyModel<GenericButtonItem.Holder>()
         val textStyle = if (bold) Typeface.BOLD else Typeface.NORMAL
         holder.button.setTypeface(null, textStyle)
 
+        holder.button.rippleColor = if (highlight) {
+            ContextCompat.getColorStateList(holder.view.context, R.color.mtrl_btn_text_btn_ripple_color)
+        } else {
+            null
+        }
+
         holder.button.onClick(buttonClickAction)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt
index d938b98eed..6ccf7fc6aa 100644
--- a/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt
+++ b/vector/src/main/java/im/vector/app/features/poll/create/CreatePollController.kt
@@ -121,6 +121,7 @@ class CreatePollController @Inject constructor(
                 textColor(host.colorProvider.getColor(R.color.palette_element_green))
                 gravity(Gravity.START)
                 bold(true)
+                highlight(false)
                 buttonClickAction {
                     host.callback?.onAddOption()
                 }