diff --git a/internal_packages/message-list/lib/message-list.cjsx b/internal_packages/message-list/lib/message-list.cjsx
index 1169b68ba..1cd3e05c0 100755
--- a/internal_packages/message-list/lib/message-list.cjsx
+++ b/internal_packages/message-list/lib/message-list.cjsx
@@ -404,7 +404,7 @@ class MessageList extends React.Component
 
   _onChange: =>
     newState = @_getStateFromStores()
-    if @state.currentThread isnt newState.currentThread
+    if @state.currentThread?.id isnt newState.currentThread?.id
       newState.minified = true
     @setState(newState)