diff --git a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt
index e3ef432a62..1983b05ed3 100644
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/helper/TimelineSettingsFactory.kt
@@ -54,15 +54,11 @@ class TimelineSettingsFactory @Inject constructor(
     }
 
     private fun List<String>.createAllowedEventTypeFilters(): List<EventTypeFilter> {
-        var result = map {
+        return map {
             EventTypeFilter(
                     eventType = it,
-                    stateKey = null
+                    stateKey = if (it == EventType.STATE_ROOM_MEMBER && userPreferencesProvider.shouldShowRoomMemberStateEvents()) session.myUserId else null
             )
         }
-        if (!userPreferencesProvider.shouldShowRoomMemberStateEvents()) {
-            result = result.filter { it.eventType != EventType.STATE_ROOM_MEMBER }
-        }
-        return result
     }
 }