diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/TimelineEventFilterFactory.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/TimelineEventFilterFactory.kt
index 1d2f465b64..e75d6dc0da 100644
--- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/TimelineEventFilterFactory.kt
+++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/TimelineEventFilterFactory.kt
@@ -46,10 +46,13 @@ class RustTimelineEventFilterFactory : TimelineEventFilterFactory {
         } else {
             emptyList()
         }
+
+        // Exclude any custom state events not supported by the SDK
+        val customStateEventsFilter = listOf(TimelineEventCondition.AnyCustomStateEvent)
         return if (excludedEventTypes.isNotEmpty() || excludedMembershipChanges.isNotEmpty()) {
-            TimelineEventFilter.Exclude(excludedEventTypes + excludedMembershipChanges)
+            TimelineEventFilter.Exclude(customStateEventsFilter + excludedEventTypes + excludedMembershipChanges)
         } else {
-            null
+            TimelineEventFilter.Exclude(customStateEventsFilter)
         }
     }
 }