App side fix for MPLY-3880. Buddy: Malcolm