UI-3292 Fixe bug for issue CHAT-18