diff --git a/web/chat/chat.react.js b/web/chat/chat.react.js
index 028a12281..022dcd643 100644
--- a/web/chat/chat.react.js
+++ b/web/chat/chat.react.js
@@ -1,20 +1,22 @@
 // @flow
 
 import * as React from 'react';
 
 import ChatMessageList from './chat-message-list.react';
 import ChatTabs from './chat-tabs.react';
 import { ThreadListProvider } from './thread-list-provider';
 
 function Chat(): React.Node {
   return (
     <>
       <ThreadListProvider>
         <ChatTabs />
       </ThreadListProvider>
       <ChatMessageList />
     </>
   );
 }
 
-export default Chat;
+const MemoizedChat: React.ComponentType<{}> = React.memo<{}>(Chat);
+
+export default MemoizedChat;