1 files changed, 4 insertions, 1 deletions
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index c902731c9..fdd069bb2 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -182,7 +182,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();