Charts: Improve event deferral