diff --git a/backend/src/lib/workflow-integrations/notification-handlers/slack.ts b/backend/src/lib/workflow-integrations/notification-handlers/slack.ts
index 66fd58b3a..b55f172cb 100644
--- a/backend/src/lib/workflow-integrations/notification-handlers/slack.ts
+++ b/backend/src/lib/workflow-integrations/notification-handlers/slack.ts
@@ -25,15 +25,15 @@ const handleSlackNotification = async ({
   switch (notification.type) {
     case TriggerFeature.ACCESS_REQUEST:
     case TriggerFeature.ACCESS_REQUEST_UPDATED:
-      targetChannelIds = slackConfig.accessRequestChannels?.split(", ") || [];
+      targetChannelIds = slackConfig.accessRequestChannels?.split(", ").filter(Boolean) || [];
       isEnabled = slackConfig.isAccessRequestNotificationEnabled;
       break;
     case TriggerFeature.SECRET_APPROVAL:
-      targetChannelIds = slackConfig.secretRequestChannels?.split(", ") || [];
+      targetChannelIds = slackConfig.secretRequestChannels?.split(", ").filter(Boolean) || [];
       isEnabled = slackConfig.isSecretRequestNotificationEnabled;
       break;
     case TriggerFeature.SECRET_SYNC_ERROR:
-      targetChannelIds = slackConfig.secretSyncErrorChannels?.split(", ") || [];
+      targetChannelIds = slackConfig.secretSyncErrorChannels?.split(", ").filter(Boolean) || [];
       isEnabled = slackConfig.isSecretSyncErrorNotificationEnabled;
       break;
     default:
diff --git a/frontend/src/pages/secret-manager/SettingsPage/components/WorkflowIntegrationSection/components/MicrosoftTeamsConfigRow.tsx b/frontend/src/pages/secret-manager/SettingsPage/components/WorkflowIntegrationSection/components/MicrosoftTeamsConfigRow.tsx
index ff1f2622b..66a228ebe 100644
--- a/frontend/src/pages/secret-manager/SettingsPage/components/WorkflowIntegrationSection/components/MicrosoftTeamsConfigRow.tsx
+++ b/frontend/src/pages/secret-manager/SettingsPage/components/WorkflowIntegrationSection/components/MicrosoftTeamsConfigRow.tsx
@@ -93,7 +93,7 @@ export const MicrosoftTeamsConfigRow = ({
         )}
       </Td>
       <Td>
-        <Badge variant="danger">Coming Soon</Badge>
+        <Badge variant="danger">Disabled</Badge>
       </Td>
       <Td>
         <DropdownMenu>
diff --git a/frontend/src/pages/secret-manager/SettingsPage/components/WorkflowIntegrationSection/components/SlackIntegrationForm.tsx b/frontend/src/pages/secret-manager/SettingsPage/components/WorkflowIntegrationSection/components/SlackIntegrationForm.tsx
index d73206969..6092a465e 100644
--- a/frontend/src/pages/secret-manager/SettingsPage/components/WorkflowIntegrationSection/components/SlackIntegrationForm.tsx
+++ b/frontend/src/pages/secret-manager/SettingsPage/components/WorkflowIntegrationSection/components/SlackIntegrationForm.tsx
@@ -141,19 +141,19 @@ export const SlackIntegrationForm = ({ onClose }: Props) => {
       if (slackChannels) {
         setValue(
           "secretRequestChannels",
-          slackConfig.secretRequestChannels
+          (slackConfig.secretRequestChannels || "")
             .split(", ")
             .filter((channel) => channel in slackChannelIdToName)
         );
         setValue(
           "accessRequestChannels",
-          slackConfig.accessRequestChannels
+          (slackConfig.accessRequestChannels || "")
             .split(", ")
             .filter((channel) => channel in slackChannelIdToName)
         );
         setValue(
           "secretSyncErrorChannels",
-          slackConfig.secretSyncErrorChannels
+          (slackConfig.secretSyncErrorChannels || "")
             .split(", ")
             .filter((channel) => channel in slackChannelIdToName)
         );