diff --git a/modules/term/eshell/config.el b/modules/term/eshell/config.el
index 217fa6ff4..595b17248 100644
--- a/modules/term/eshell/config.el
+++ b/modules/term/eshell/config.el
@@ -181,5 +181,5 @@ You should use `set-eshell-alias!' to change this.")
   ;;      installed for bash completion to work. How frustrating. This way we
   ;;      can at least get bash completion whether or not fish is present.
   (defadvice! +eshell--fallback-to-bash-a (&rest _)
-    :before-while #'fish-completion--list-completions-with-desc
-    (executable-find "fish")))
+    :before-until #'fish-completion--list-completions-with-desc
+    (unless (executable-find "fish") "")))