diff --git a/src/components/structures/TimelinePanel.js b/src/components/structures/TimelinePanel.js
index 2840fd4579..6f72fcc767 100644
--- a/src/components/structures/TimelinePanel.js
+++ b/src/components/structures/TimelinePanel.js
@@ -512,7 +512,9 @@ var TimelinePanel = React.createClass({
         // TODO: We should restrict this to only events in our timeline,
         // but possibly the event tile itself should just update when this
         // happens to save us re-rendering the whole timeline.
-        this.forceUpdate();
+        if (ev.getRoomId() === this.props.timelineSet.room.roomId) {
+            this.forceUpdate();
+        }
     },
 
     onSync: function(state, prevState, data) {