diff --git a/roomserver/internal/input/input_latest_events.go b/roomserver/internal/input/input_latest_events.go
index 9c6e6a25..b6666cc0 100644
--- a/roomserver/internal/input/input_latest_events.go
+++ b/roomserver/internal/input/input_latest_events.go
@@ -242,6 +242,7 @@ func (u *latestEventsUpdater) latestState() error {
 		)
 		u.added = u.added[:0]
 		u.removed = u.removed[:0]
+		u.newStateNID = u.oldStateNID
 		return nil
 	}