diff --git a/extensions/mattermost/src/mattermost/monitor.ts b/extensions/mattermost/src/mattermost/monitor.ts
index 47d95efad70..85ac53d97e8 100644
--- a/extensions/mattermost/src/mattermost/monitor.ts
+++ b/extensions/mattermost/src/mattermost/monitor.ts
@@ -466,7 +466,7 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
       callbackUrl,
       resolveSessionKey: async (channelId: string) => {
         const channelInfo = await resolveChannelInfo(channelId);
-        const kind = channelKind(channelInfo?.type);
+        const kind = mapMattermostChannelTypeToChatType(channelInfo?.type);
         const teamId = channelInfo?.team_id ?? undefined;
         const route = core.channel.routing.resolveAgentRoute({
           cfg,
@@ -482,7 +482,7 @@ export async function monitorMattermostProvider(opts: MonitorMattermostOpts = {}
       },
       dispatchButtonClick: async (opts) => {
         const channelInfo = await resolveChannelInfo(opts.channelId);
-        const kind = channelKind(channelInfo?.type);
+        const kind = mapMattermostChannelTypeToChatType(channelInfo?.type);
         const chatType = channelChatType(kind);
         const teamId = channelInfo?.team_id ?? undefined;
         const channelName = channelInfo?.name ?? undefined;