Fix issue with next events disappearing on last page of previous events
Updates #30896