diff --git a/src/components/structures/RoomView.js b/src/components/structures/RoomView.js
index 942e3c8e07..79420e776a 100644
--- a/src/components/structures/RoomView.js
+++ b/src/components/structures/RoomView.js
@@ -95,11 +95,11 @@ module.exports = React.createClass({
             peekLoading: false,
 
             // The event to be scrolled to initially
-            eventId: null,
+            initialEventId: null,
             // The offset in pixels from the event with which to scroll vertically
-            eventPixelOffset: null,
+            initialEventPixelOffset: null,
             // Whether to highlight the event scrolled to
-            isEventHighlighted: null,
+            isInitialEventHighlighted: null,
 
             forwardingEvent: null,
             editingRoomSettings: false,