diff --git a/lib/src/room.dart b/lib/src/room.dart
index 07b112cf..d4c80d26 100644
--- a/lib/src/room.dart
+++ b/lib/src/room.dart
@@ -1351,10 +1351,7 @@ class Room {
     var chunk = TimelineChunk(events: events);
     // Load the timeline arround eventContextId if set
     if (eventContextId != null) {
-      if (events.firstWhereOrNull((event) => event.eventId == eventContextId) !=
-          null) {
-        chunk = TimelineChunk(events: events);
-      } else {
+      if (!events.any((Event event) => event.eventId == eventContextId)) {
         chunk =
             await getEventContext(eventContextId) ?? TimelineChunk(events: []);
       }