diff --git a/front/components/assistant_builder/AssistantBuilder.tsx b/front/components/assistant_builder/AssistantBuilder.tsx
index 5a2827f2bf9c..b6483283cd3f 100644
--- a/front/components/assistant_builder/AssistantBuilder.tsx
+++ b/front/components/assistant_builder/AssistantBuilder.tsx
@@ -362,6 +362,7 @@ export default function AssistantBuilder({
     useSlackChannelsLinkedWithAgent({
       workspaceId: owner.sId,
       dataSourceName: slackDataSource?.name ?? undefined,
+      disabled: !isBuilder(owner),
     });
   const [slackChannelsInitialized, setSlackChannelsInitialized] =
     useState(false);
@@ -1460,7 +1461,7 @@ function SlackIntegration({
           <Button
             labelVisible={true}
             label={"Select channels"}
-            variant={"primary"}
+            variant={"secondary"}
             icon={PlusIcon}
             onClick={openModal}
           />
diff --git a/front/lib/swr.ts b/front/lib/swr.ts
index ba132d7e920c..6ea98d09071f 100644
--- a/front/lib/swr.ts
+++ b/front/lib/swr.ts
@@ -537,15 +537,17 @@ export function useAgentUsage({
 export function useSlackChannelsLinkedWithAgent({
   workspaceId,
   dataSourceName,
+  disabled,
 }: {
   workspaceId: string;
   dataSourceName?: string;
+  disabled?: boolean;
 }) {
   const slackChannelsLinkedWithAgentFetcher: Fetcher<GetSlackChannelsLinkedWithAgentResponseBody> =
     fetcher;
 
   const { data, error, mutate } = useSWR(
-    dataSourceName
+    dataSourceName && !disabled
       ? `/api/w/${workspaceId}/data_sources/${dataSourceName}/managed/slack/channels_linked_with_agent`
       : null,
     slackChannelsLinkedWithAgentFetcher