diff --git a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/MessagesPresenterTest.kt b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/MessagesPresenterTest.kt
index 6ff003b735..c19dbe7cdc 100644
--- a/features/messages/impl/src/test/kotlin/io/element/android/features/messages/MessagesPresenterTest.kt
+++ b/features/messages/impl/src/test/kotlin/io/element/android/features/messages/MessagesPresenterTest.kt
@@ -548,8 +548,9 @@ class MessagesPresenterTest {
         moleculeFlow(RecompositionMode.Immediate) {
             presenter.present()
         }.test {
-            val initialState = consumeItemsUntilTimeout().last()
+            val initialState = consumeItemsUntilPredicate { it.userHasPermissionToRedact }.last()
             assertThat(initialState.userHasPermissionToRedact).isTrue()
+            cancelAndIgnoreRemainingEvents()
         }
     }