diff --git a/src/matrix/room/timeline/Timeline.js b/src/matrix/room/timeline/Timeline.js
index 73086db4..49c171c1 100644
--- a/src/matrix/room/timeline/Timeline.js
+++ b/src/matrix/room/timeline/Timeline.js
@@ -120,12 +120,17 @@ export class Timeline {
             return params ? params : false;
         };
         // first, look in local entries based on txn id
-        const foundInLocalEntries = this._localEntries.findAndUpdate(
-            e => e.id === pe.relatedTxnId,
-            updateOrFalse,
-        );
+        if (pe.relatedTxnId) {
+            const found = this._localEntries.findAndUpdate(
+                e => e.id === pe.relatedTxnId,
+                updateOrFalse,
+            );
+            if (found) {
+                return;
+            }
+        }
         // now look in remote entries based on event id
-        if (!foundInLocalEntries && pe.relatedEventId) {
+        if (pe.relatedEventId) {
             this._remoteEntries.findAndUpdate(
                 e => e.id === pe.relatedEventId,
                 updateOrFalse