diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fef9522..02c2409e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -48,6 +48,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- **A zsh or fish you gave your own arguments to is no longer injected into.**
+  Custom arguments have always been the line where tty7 backs off — the bash,
+  PowerShell and WSL setups checked for them — but the zsh and fish setups did
+  not, so a `fish` started with your flags had `-C <script>` appended to them
+  and a `zsh` had its `ZDOTDIR` swapped out from under its startup files. Both
+  now behave like the rest. **This turns shell integration off for a config
+  that sets `shell` or a `custom_shells` entry with `args`** — including the
+  `{"program": "fish", "args": ["-l"]}` the reference page used to print as an
+  example — so prompt marks, working directory reporting, command-finished
+  notifications, inline completion, <kbd>⌃ R</kbd> and per-pane history stop in
+  those panes. Drop the arguments to get them back, and the notice a pane
+  raises when integration never engaged now names this as a cause (#624, #629).
 - **An SSH pane is named after its host.** A fresh SSH tab reads the host's
   name, or its address when the host has none — every host imported from
   `~/.ssh/config` arrives nameless, and a window full of them all read `tty7`
diff --git a/src/ui/i18n/en.rs b/src/ui/i18n/en.rs
index ae11bcfb..b54020b4 100644
--- a/src/ui/i18n/en.rs
+++ b/src/ui/i18n/en.rs
@@ -1652,8 +1652,8 @@ pub fn translate_en(key: L10nKey) -> &'static str {
         }
         L10nKey::IntegrationNoticeNotEngaged => {
             "tty7 shell integration hasn't engaged in this pane, so inline completion and the \
-             Ctrl+R menu are unavailable. A PTY wrapper (figterm-style) or an unsupported shell \
-             setup can cause this."
+             Ctrl+R menu are unavailable. A shell you started with your own arguments, a PTY \
+             wrapper (figterm-style), or an unsupported shell setup can cause this."
         }
         L10nKey::PaneTitleDisconnected => "{title} — disconnected",
         L10nKey::PaneTitleProcessExited => "{title} — process exited",
diff --git a/src/ui/i18n/ja.rs b/src/ui/i18n/ja.rs
index c56c435d..0891032e 100644
--- a/src/ui/i18n/ja.rs
+++ b/src/ui/i18n/ja.rs
@@ -1700,7 +1700,8 @@ pub fn translate_ja(key: L10nKey) -> Option<&'static str> {
         }
         L10nKey::IntegrationNoticeNotEngaged => {
             "このペインでは tty7 シェル統合が有効になっていないため、インライン補完と Ctrl+R \
-             メニューは利用できません。PTY ラッパー（figterm 系）や未対応のシェル設定が原因の可能性があります。"
+             メニューは利用できません。独自の引数で起動したシェル、PTY ラッパー（figterm 系）、\
+             未対応のシェル設定が原因の可能性があります。"
         }
         L10nKey::PaneTitleDisconnected => "{title} — 切断されました",
         L10nKey::PaneTitleProcessExited => "{title} — プロセスが終了しました",
diff --git a/src/ui/i18n/zh.rs b/src/ui/i18n/zh.rs
index a0c287bc..bd99fc05 100644
--- a/src/ui/i18n/zh.rs
+++ b/src/ui/i18n/zh.rs
@@ -1549,7 +1549,8 @@ pub fn translate_zh(key: L10nKey) -> Option<&'static str> {
         }
         L10nKey::IntegrationNoticeNotEngaged => {
             "此窗格中的 tty7 shell 集成尚未生效，内联补全和 Ctrl+R 菜单不可用。\
-             PTY 包装器（figterm 类）或不受支持的 shell 配置可能导致此问题。"
+             用你自己参数启动的 shell、PTY 包装器（figterm 类）或不受支持的 shell 配置\
+             都可能导致此问题。"
         }
         L10nKey::PaneTitleDisconnected => "{title} — 已断开",
         L10nKey::PaneTitleProcessExited => "{title} — 进程已退出",