diff --git a/vector/src/main/java/im/vector/app/features/roomprofile/polls/active/RoomActivePollsController.kt b/vector/src/main/java/im/vector/app/features/roomprofile/polls/active/RoomActivePollsController.kt
index 2fab886282..dc14ec366d 100644
--- a/vector/src/main/java/im/vector/app/features/roomprofile/polls/active/RoomActivePollsController.kt
+++ b/vector/src/main/java/im/vector/app/features/roomprofile/polls/active/RoomActivePollsController.kt
@@ -33,7 +33,9 @@ class RoomActivePollsController @Inject constructor(
     var listener: Listener? = null
 
     override fun buildModels(data: List<PollSummary.ActivePoll>?) {
-        if (data == null) return
+        if (data.isNullOrEmpty()) {
+            return
+        }
 
         val host = this
         data.forEach { poll ->
diff --git a/vector/src/main/res/layout/item_poll.xml b/vector/src/main/res/layout/item_poll.xml
index 2db6450f94..05e9b3a62a 100644
--- a/vector/src/main/res/layout/item_poll.xml
+++ b/vector/src/main/res/layout/item_poll.xml
@@ -25,7 +25,8 @@
         android:src="@drawable/ic_attachment_poll"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/pollActiveDate"
-        app:tint="?vctr_content_secondary" />
+        app:tint="?vctr_content_secondary"
+        tools:ignore="ContentDescription" />
 
     <TextView
         android:id="@+id/pollActiveTitle"