[#53779563] Chat fixes