Chat performance fix