UI-3292 fix bug for issue CHAT-21