diff --git a/src/actions/MatrixActionCreators.js b/src/actions/MatrixActionCreators.js
index a9ea671fbef..a307af6f57e 100644
--- a/src/actions/MatrixActionCreators.js
+++ b/src/actions/MatrixActionCreators.js
@@ -71,6 +71,8 @@ function createRoomTimelineAction(matrixClient, timelineEvent, room, toStartOfTi
         action: 'MatrixActions.Room.timeline',
         event: timelineEvent,
         isLiveEvent: data.liveEvent,
+        isLiveUnfilteredRoomTimelineEvent:
+            room && data.timeline.getTimelineSet() === room.getUnfilteredTimelineSet(),
     };
 }
 
diff --git a/src/stores/RoomListStore.js b/src/stores/RoomListStore.js
index 707a9da17e3..8a3af309fce 100644
--- a/src/stores/RoomListStore.js
+++ b/src/stores/RoomListStore.js
@@ -81,6 +81,7 @@ class RoomListStore extends Store {
             case 'MatrixActions.Room.timeline': {
                 if (!this._state.ready ||
                     !payload.isLiveEvent ||
+                    !payload.isLiveUnfilteredRoomTimelineEvent ||
                     !this._eventTriggersRecentReorder(payload.event)
                 ) break;
                 this._generateRoomLists();