diff --git a/src/matrix/room/timeline/Timeline.js b/src/matrix/room/timeline/Timeline.js
index 8f488611..8dbe8b69 100644
--- a/src/matrix/room/timeline/Timeline.js
+++ b/src/matrix/room/timeline/Timeline.js
@@ -313,8 +313,10 @@ export class Timeline {
      * @param {EventEntry[]} entries 
      */
     async _loadContextEntriesWhereNeeded(entries) {
-        const entriesNeedingContext = entries.filter(e => !!e.contextEventId);
-        for (const entry of entriesNeedingContext) {
+        for (const entry of entries) {
+            if (!entry.contextEventId) {
+                continue;
+            }
             const id = entry.contextEventId;
             let contextEvent = this._getTrackedEntry(id);
             if (!contextEvent) {