diff --git a/docs/configuration.md b/docs/configuration.md
index 02b042dff..245a6b670 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -710,6 +710,11 @@ Gmail helper config (used by `clawdis hooks gmail setup` / `run`):
 }
 ```
 
+Gateway auto-start:
+- If `hooks.enabled=true` and `hooks.gmail.account` is set, the Gateway starts
+  `gog gmail watch serve` on boot and auto-renews the watch.
+- Set `CLAWDIS_SKIP_GMAIL_WATCHER=1` to disable the auto-start (for manual runs).
+
 Note: when `tailscale.mode` is on, Clawdis defaults `serve.path` to `/` so
 Tailscale can proxy `/gmail-pubsub` correctly (it strips the set-path prefix).
 
diff --git a/docs/gmail-pubsub.md b/docs/gmail-pubsub.md
index 6a90c7663..ab619b0fc 100644
--- a/docs/gmail-pubsub.md
+++ b/docs/gmail-pubsub.md
@@ -56,7 +56,12 @@ Want a custom endpoint? Use `--push-endpoint <url>` or `--tailscale off`.
 Platform note: on macOS the wizard installs `gcloud`, `gogcli`, and `tailscale`
 via Homebrew; on Linux install them manually first.
 
-Run the daemon (starts `gog gmail watch serve` + auto-renew):
+Gateway auto-start (recommended):
+- When `hooks.enabled=true` and `hooks.gmail.account` is set, the Gateway starts
+  `gog gmail watch serve` on boot and auto-renews the watch.
+- Set `CLAWDIS_SKIP_GMAIL_WATCHER=1` to opt out (useful if you run the daemon yourself).
+
+Manual daemon (starts `gog gmail watch serve` + auto-renew):
 
 ```bash
 clawdis hooks gmail run