Chat performance fix
Merge pull request #2591 from dimagi/chat-fix

Chat performance fix