diff --git a/src/models/event-timeline-set.js b/src/models/event-timeline-set.js
index 8d96b56e1110a57305dca46cd2211d2dda480900..46d5e8790bc1fea97750bba0cde383c10b54f434 100644
--- a/src/models/event-timeline-set.js
+++ b/src/models/event-timeline-set.js
@@ -155,7 +155,9 @@ EventTimelineSet.prototype.replaceEventId = function(oldEventId, newEventId) {
  *
  * @fires module:client~MatrixClient#event:"Room.timelineReset"
  */
-EventTimelineSet.prototype.resetLiveTimeline = function(backPaginationToken, flush, onNewLiveTimeline) {
+EventTimelineSet.prototype.resetLiveTimeline = function(
+    backPaginationToken, flush, onNewLiveTimeline,
+) {
     // if timeline support is disabled, forget about the old timelines
     const resetAllTimelines = !this._timelineSupport || flush;
 
diff --git a/src/models/room.js b/src/models/room.js
index ce86e142f3f43174630610273e9e5454cbc5f823..d26edd16d2fa63a2d335e2eacdbc97a1a88f517c 100644
--- a/src/models/room.js
+++ b/src/models/room.js
@@ -211,9 +211,13 @@ Room.prototype.getLiveTimeline = function() {
  * once it has been created, but before it has had any event inserted into it. This can be
  * used to add any event listeners.
  */
-Room.prototype.resetLiveTimeline = function(backPaginationToken, flush, onNewLiveTimeline) {
+Room.prototype.resetLiveTimeline = function(
+    backPaginationToken, flush, onNewLiveTimeline,
+) {
     // The unfiltered timeline set (we pass the onNewLiveTimeline callback here)
-    this._timelineSets[0].resetLiveTimeline(backPaginationToken, flush, onNewLiveTimeline);
+    this._timelineSets[0].resetLiveTimeline(
+        backPaginationToken, flush, onNewLiveTimeline,
+    );
 
     // any other timeline sets
     for (let i = 1; i < this._timelineSets.length; i++) {
diff --git a/src/sync.js b/src/sync.js
index 6aee97b072d0cb198a2fdb40693164418e6d2d89..9e0e431f61f3cd7cbcffca1ac503d27fd13da1bc 100644
--- a/src/sync.js
+++ b/src/sync.js
@@ -126,6 +126,7 @@ SyncApi.prototype.createRoom = function(roomId) {
 
 /**
  * @param {Room} room
+ * @param {RoomState} currentState The current state of the room's live, unfiltered timeline
  * @private
  */
 SyncApi.prototype._registerStateListeners = function(room, currentState) {
@@ -893,8 +894,11 @@ SyncApi.prototype._processSyncResponse = function(syncToken, data) {
                     joinObj.timeline.prev_batch,
                     self.opts.canResetEntireTimeline(room.roomId),
                     (newLiveTimeline) => {
-                        self._registerStateListeners(room, newLiveTimeline.getState(EventTimeline.FORWARDS));
-                    }
+                        self._registerStateListeners(
+                            room,
+                            newLiveTimeline.getState(EventTimeline.FORWARDS),
+                        );
+                    },
                 );
 
                 // We have to assume any gap in any timeline is