re #889 - Fixed regression by setting 'upcoming' as default state