ADEN-795 Mobile GPT fix