diff --git a/app/scenes/channel/channel.js b/app/scenes/channel/channel.js
index 39b777a88..7500d4899 100644
--- a/app/scenes/channel/channel.js
+++ b/app/scenes/channel/channel.js
@@ -123,7 +123,7 @@ export default class Channel extends React.PureComponent {
         }
 
         let teamId = currentChannel.team_id;
-        if (currentChannel.type === Constants.DM_CHANNEL) {
+        if (currentChannel.type === Constants.DM_CHANNEL || currentChannel.type === Constants.GM_CHANNEL) {
             teamId = currentTeam.id;
         }