1 files changed, 4 insertions, 1 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 33ef8a851..14790fbec 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -185,7 +185,10 @@ export default class Sidebar extends React.Component {
 
             let currentChannelName = channel.display_name;
             if (channel.type === 'D') {
-                currentChannelName = Utils.getDirectTeammate(channel.id).username;
+                const teammate = Utils.getDirectTeammate(channel.id);
+                if (teammate != null) {
+                    currentChannelName = teammate.username;
+                }
             }
 
             const unread = this.getTotalUnreadCount();