diff --git a/src/matrix/room/timeline/Timeline.js b/src/matrix/room/timeline/Timeline.js
index 2e793be1..bb6c9ac5 100644
--- a/src/matrix/room/timeline/Timeline.js
+++ b/src/matrix/room/timeline/Timeline.js
@@ -340,7 +340,6 @@ export class Timeline {
                 }
             }
             if (contextEvent) {
-                contextEvent.setAsContextOf(entry);
                 entry.setContextEntry(contextEvent);
                 this._updateEntry(entry);
             }
diff --git a/src/matrix/room/timeline/entries/EventEntry.js b/src/matrix/room/timeline/entries/EventEntry.js
index bdabfea4..513d427a 100644
--- a/src/matrix/room/timeline/entries/EventEntry.js
+++ b/src/matrix/room/timeline/entries/EventEntry.js
@@ -48,6 +48,7 @@ export class EventEntry extends BaseEventEntry {
 
     setContextEntry(entry) {
         this._contextEntry = entry;
+        entry.setAsContextOf(this);
     }
 
     setAsContextOf(entry) {