diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
index 6b7f884708..7415b988a4 100644
--- a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
+++ b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/internal/session/filter/FilterFactory.kt
@@ -56,11 +56,11 @@ internal object FilterFactory {
         )
     }
 
-    private fun createElementTimelineFilter(): RoomEventFilter {
-        return RoomEventFilter().apply {
+    private fun createElementTimelineFilter(): RoomEventFilter? {
+        return null // RoomEventFilter().apply {
             // TODO Enable this for optimization
             // types = listOfSupportedEventTypes.toMutableList()
-        }
+        // }
     }
 
     private fun createElementStateFilter(): RoomEventFilter {