diff --git a/roomserver/internal/input/input_latest_events.go b/roomserver/internal/input/input_latest_events.go
index 9ad8b0422..c9d2a4785 100644
--- a/roomserver/internal/input/input_latest_events.go
+++ b/roomserver/internal/input/input_latest_events.go
@@ -237,7 +237,7 @@ func (u *latestEventsUpdater) latestState() error {
 	// include the new event from the input path, depending on whether
 	// it is a forward extremity or not.
 	latestStateAtEvents := make([]types.StateAtEvent, len(u.latest))
-	for i := range u.latest {
+	for i := range append(u.latest, u.oldLatest...) {
 		latestStateAtEvents[i] = u.latest[i].StateAtEvent
 	}