diff --git a/services/web/frontend/js/features/chat/components/chat-pane.js b/services/web/frontend/js/features/chat/components/chat-pane.js
index 224390492c..a170c5fbc3 100644
--- a/services/web/frontend/js/features/chat/components/chat-pane.js
+++ b/services/web/frontend/js/features/chat/components/chat-pane.js
@@ -18,7 +18,7 @@ const ChatPane = React.memo(function ChatPane() {
 
   const { chatIsOpen } = useLayoutContext({ chatIsOpen: PropTypes.bool })
   const { user } = useApplicationContext({
-    user: PropTypes.shape({ id: PropTypes.string.isRequired }.isRequired),
+    user: PropTypes.shape({ id: PropTypes.string.isRequired }),
   })
 
   const {
@@ -55,6 +55,10 @@ const ChatPane = React.memo(function ChatPane() {
     throw error
   }
 
+  if (!user) {
+    return null
+  }
+
   return (
     <aside className="chat">
       <InfiniteScroll