diff --git a/src/models/room.js b/src/models/room.js
index b09e34944..fd55a7f51 100644
--- a/src/models/room.js
+++ b/src/models/room.js
@@ -1037,7 +1037,7 @@ Room.prototype._addLiveEvent = function(event, duplicateStrategy) {
         const relatesTo = event.getRelation();
         const replacedId = relatesTo && relatesTo.event_id;
         const replacedEvent = this.getUnfilteredTimelineSet().findEventById(replacedId);
-        if (replacedEvent) {
+        if (replacedEvent && event.getSender() === replacedEvent.getSender()) {
             const doAndEmitReplacement = () => {
                 replacedEvent.makeReplaced(event);
                 this.emit("Room.replaceEvent", replacedEvent, this);