Fix another new chat issue