diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailActivity.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailActivity.kt
index ed89526349..cf29d5618a 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailActivity.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailActivity.kt
@@ -47,11 +47,12 @@ class RoomPollDetailActivity : VectorBaseActivity<ActivitySimpleBinding>() {
     }
 
     companion object {
-        fun newIntent(context: Context, pollId: String, roomId: String): Intent {
+        fun newIntent(context: Context, pollId: String, roomId: String, isEnded: Boolean): Intent {
             return Intent(context, RoomPollDetailActivity::class.java).apply {
                 val args = RoomPollDetailArgs(
                         pollId = pollId,
                         roomId = roomId,
+                        isEnded = isEnded,
                 )
                 putExtra(Mavericks.KEY_ARG, args)
             }
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailFragment.kt
index 8340c677ef..4e2c7461f7 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/detail/ui/RoomPollDetailFragment.kt
@@ -37,6 +37,7 @@ import javax.inject.Inject
 data class RoomPollDetailArgs(
         val pollId: String,
         val roomId: String,
+        val isEnded: Boolean,
 ) : Parcelable
 
 @AndroidEntryPoint
@@ -55,7 +56,7 @@ class RoomPollDetailFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        setupToolbar()
+        setupToolbar(isEnded = roomPollDetailArgs.isEnded)
         setupDetailView()
         // TODO add link to go to timeline message + create a ViewNavigator
     }
@@ -74,11 +75,10 @@ class RoomPollDetailFragment :
         )
     }
 
-    private fun setupToolbar(isEnded: Boolean? = null) {
+    private fun setupToolbar(isEnded: Boolean) {
         val title = when (isEnded) {
             true -> getString(R.string.room_polls_ended)
             false -> getString(R.string.room_polls_active)
-            else -> ""
         }
 
         setupToolbar(views.roomPollDetailToolbar)
@@ -87,9 +87,6 @@ class RoomPollDetailFragment :
     }
 
     override fun invalidate() = withState(viewModel) { state ->
-        state.pollDetail ?: return@withState
-        // TODO should we update the title when the poll status changes?
-        setupToolbar(state.pollDetail.isEnded)
         roomPollDetailController.setData(state)
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/list/ui/RoomPollsListFragment.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/list/ui/RoomPollsListFragment.kt
index bbf058d908..4324dcf124 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/list/ui/RoomPollsListFragment.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/list/ui/RoomPollsListFragment.kt
@@ -132,6 +132,7 @@ abstract class RoomPollsListFragment :
                 context = requireContext(),
                 pollId = pollId,
                 roomId = it.roomId,
+                isEnded = getRoomPollsType() == RoomPollsType.ENDED,
         )
     }
 
diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/list/ui/RoomPollsListNavigator.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/list/ui/RoomPollsListNavigator.kt
index 3cba2fc355..c377d21490 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/list/ui/RoomPollsListNavigator.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/list/ui/RoomPollsListNavigator.kt
@@ -23,12 +23,13 @@ import javax.inject.Inject
 // TODO add unit tests
 class RoomPollsListNavigator @Inject constructor() {
 
-    fun goToPollDetails(context: Context, pollId: String, roomId: String) {
+    fun goToPollDetails(context: Context, pollId: String, roomId: String, isEnded: Boolean) {
         context.startActivity(
                 RoomPollDetailActivity.newIntent(
                         context = context,
                         pollId = pollId,
                         roomId = roomId,
+                        isEnded = isEnded,
                 )
         )
     }