diff --git a/roomserver/internal/query/query.go b/roomserver/internal/query/query.go
index cc5ec339b..f5d8c2d49 100644
--- a/roomserver/internal/query/query.go
+++ b/roomserver/internal/query/query.go
@@ -75,7 +75,7 @@ func (r *Queryer) QueryStateAfterEvents(
 		if _, ok := err.(types.MissingEventError); ok {
 			return nil
 		}
-		return nil
+		return err
 	}
 	response.PrevEventsExist = true