RTC 51608: additional fix for back button crashing