UI-3292 quick fix bug issue CHAT-22