diff --git a/internal_packages/message-list/lib/sidebar-participant-picker.jsx b/internal_packages/message-list/lib/sidebar-participant-picker.jsx
index 846d5430a..fc1a1b711 100644
--- a/internal_packages/message-list/lib/sidebar-participant-picker.jsx
+++ b/internal_packages/message-list/lib/sidebar-participant-picker.jsx
@@ -62,7 +62,7 @@ export default class SidebarParticipantPicker extends React.Component {
   render() {
     const {sortedContacts, focusedContact} = this.state
     const value = this._getKeyForContact(focusedContact)
-    if (sortedContacts.length === 0) {
+    if (sortedContacts.length === 0 || !value) {
       return false
     }
     return (