bz920577, RF-12250: workaround for issue when Push stops to work when re-rendered