MOB-2585 notification fix