diff --git a/guides/ai-agents/getting-started.mdx b/guides/ai-agents/getting-started.mdx
index 0c017510..62e78889 100644
--- a/guides/ai-agents/getting-started.mdx
+++ b/guides/ai-agents/getting-started.mdx
@@ -220,6 +220,10 @@ Connect your agent to Slack channels so users can interact directly from Slack.
   <img src="/images/guides/ai-agents/add-lightdash-app-to-slack.png" />
 </Frame>
 
+<Tip>
+  You can also link an agent to a channel directly from Slack — see [Linking an agent from Slack](#linking-an-agent-from-slack) below.
+</Tip>
+
 4. Now you can interact with your AI agent in slack just as you would in the Lightdash UI. Start asking questions like "What kind of data can you access?" or "Show me total order amount over time".
 
 <Frame>
@@ -266,3 +270,35 @@ Once a channel is designated as the multi-agent channel, all eligible agents in
 <Warning>
 If you see the error **"This Slack channel is already assigned to another AI agent"** while trying to attach a second agent via the per-agent integration path, that path only supports single-agent channels. Switch to the org-level multi-agent channel setup described above instead.
 </Warning>
+
+### Linking an agent from Slack
+
+You don't have to go to the Lightdash UI to connect an agent to a Slack channel. When someone `@mentions` the Lightdash app in a channel that has no agent configured, Lightdash offers to link one right in the thread:
+
+- **One manageable agent** — Lightdash auto-links it to the channel, confirms the link in-thread, and then answers the original question in the same turn.
+- **Multiple manageable agents** — Lightdash posts an in-thread picker showing every agent the user can manage (labeled by agent and project). Selecting one links it to the channel and processes the original question.
+- **No manageable agents** — Lightdash posts an ephemeral message asking the user to contact an admin, with a deep link to the AI agents page.
+
+Only users with permission to manage the agent can link it. If a Slack user doesn't have `manage:AiAgent` on any org agent, they see the "ask an admin" message instead of a picker.
+
+<Info>
+  "Manageable agent" means an agent the invoking Slack user has permission to edit. If they lack manage permission on every agent (or aren't linked to a Lightdash account yet), no channel binding is created.
+</Info>
+
+#### Turning off automatic channel linking
+
+For organizations with stricter data governance requirements, you can require that channels only be added from the agent settings UI and never from Slack. This turns the configured channel list into a strict allowlist.
+
+To disable auto-linking:
+
+1. Go to **Organization Settings → Integrations → Slack**
+2. Under the **AI Agents configuration** panel, turn off **Enable automatic channel linking**
+3. Click **Save**
+
+When automatic channel linking is off:
+
+- `@mentioning` the bot in an unconfigured channel posts an ephemeral message pointing to the AI agents page instead of auto-linking or offering the picker.
+- Adding and removing channels from the agent settings page continues to work exactly as before.
+- Existing channel links are unaffected — this only controls new links created from Slack.
+
+Automatic channel linking is **on by default** so first-time setup stays seamless.
diff --git a/references/integrations/slack-integration.mdx b/references/integrations/slack-integration.mdx
index 353c6a17..975b2253 100644
--- a/references/integrations/slack-integration.mdx
+++ b/references/integrations/slack-integration.mdx
@@ -52,6 +52,17 @@ To have each Slack user properly identified and use their own permissions, enabl
 We recommend enabling OAuth if your organization uses row-level or column-level security through user attributes, or if you need an audit trail of which users are asking which questions.
 </Tip>
 
+#### Automatic channel linking
+
+When someone `@mentions` the Lightdash app in a channel that has no agent configured, Lightdash offers to link an agent to that channel from Slack — either auto-linking the user's one manageable agent, or posting an in-thread picker if the user manages multiple. See [Linking an agent from Slack](/guides/ai-agents/getting-started#linking-an-agent-from-slack) for the full flow.
+
+This is controlled by the **Enable automatic channel linking** toggle in the AI Agents configuration panel:
+
+- **On (default)** — Slack mentions in unconfigured channels can add the channel to an agent's list, so first-time setup is seamless.
+- **Off** — Slack mentions in unconfigured channels post an ephemeral message pointing to the AI agents page, and never modify an agent's channel list. Channels can only be managed from the agent settings UI.
+
+Turn this off if you need the configured channel list to be a strict allowlist — for example, to prevent a sensitive agent from being extended into new channels by an admin's Slack activity. Turning it off does not affect channels that are already linked.
+
 ## Using Lightdash in private channels
 
 Lightdash supports private Slack channels, but because Slack doesn't allow apps to see private channels by default, you'll need to manually add the Lightdash app to your private channel first.