diff --git a/internal_packages/message-list/lib/message-list.cjsx b/internal_packages/message-list/lib/message-list.cjsx
index b325d998c..d49a81d42 100755
--- a/internal_packages/message-list/lib/message-list.cjsx
+++ b/internal_packages/message-list/lib/message-list.cjsx
@@ -219,7 +219,9 @@ class MessageList extends React.Component
 
   _prepareContentForDisplay: =>
     _.delay =>
-      focusedMessage = React.findDOMNode(@).querySelector(".initial-focus")
+      node = React.findDOMNode(@)
+      return unless node
+      focusedMessage = node.querySelector(".initial-focus")
       @scrollToMessage focusedMessage, =>
         @setState(ready: true)
       @_cacheScrollPos()