diff --git a/projects/fishshell.com/command_not_found_handler.diff b/projects/fishshell.com/command_not_found_handler.diff
new file mode 100644
index 00000000..9399d1eb
--- /dev/null
+++ b/projects/fishshell.com/command_not_found_handler.diff
@@ -0,0 +1,68 @@
+diff --git a/doc_src/language.rst b/doc_src/language.rst
+index 16558cc8899..f3767415f8e 100644
+--- a/doc_src/language.rst
++++ b/doc_src/language.rst
+@@ -1718,7 +1718,7 @@ In order:
+    - If the kernel knows how to run the file (e.g. via a ``#!`` line - ``#!/bin/sh`` or ``#!/usr/bin/python``), it does it.
+    - If the kernel reports that it couldn't run it because of a missing interpreter, and the file passes a rudimentary check, fish tells ``/bin/sh`` to run it.
+ 
+-If none of these work, fish runs the function :doc:`fish_command_not_found <cmds/fish_command_not_found>` and sets :envvar:`status` to 127.
++If none of these work, fish runs the function :doc:`fish_command_not_found <cmds/fish_command_not_found>`.
+ 
+ You can use :doc:`type <cmds/type>` to see how fish resolved something::
+ 
+diff --git a/share/functions/fish_command_not_found.fish b/share/functions/fish_command_not_found.fish
+index 36ca2190553..77b3a78f7b9 100644
+--- a/share/functions/fish_command_not_found.fish
++++ b/share/functions/fish_command_not_found.fish
+@@ -13,6 +13,7 @@ end
+ 
+ function __fish_default_command_not_found_handler
+     printf (_ "fish: Unknown command: %s\n") (string escape -- $argv[1]) >&2
++    return 127
+ end
+ 
+ # If an old handler already exists, defer to that.
+diff --git a/src/parse_execution.cpp b/src/parse_execution.cpp
+index 1050095116d..01b74398da1 100644
+--- a/src/parse_execution.cpp
++++ b/src/parse_execution.cpp
+@@ -723,7 +723,8 @@ parse_execution_context_t::ast_args_list_t parse_execution_context_t::get_argume
+ end_execution_reason_t parse_execution_context_t::handle_command_not_found(
+     const wcstring &cmd_str, const ast::decorated_statement_t &statement, int err_code) {
+     // We couldn't find the specified command. This is a non-fatal error. We want to set the exit
+-    // status to 127, which is the standard number used by other shells like bash and zsh.
++    // status to 127, which is the standard number used by other shells like bash and zsh,
++    // unless there is an explicit command handler, then we can use its exit code.
+ 
+     const wchar_t *const cmd = cmd_str.c_str();
+     if (err_code != ENOENT) {
+@@ -770,7 +771,6 @@ end_execution_reason_t parse_execution_context_t::handle_command_not_found(
+ 
+     // Redirect to stderr
+     auto io = io_chain_t{};
+-    io.append_from_specs({redirection_spec_t{STDOUT_FILENO, redirection_mode_t::fd, L"2"}}, L"");
+ 
+     if (function_exists(L"fish_command_not_found", *parser)) {
+         buffer = L"fish_command_not_found";
+@@ -778,15 +778,18 @@ end_execution_reason_t parse_execution_context_t::handle_command_not_found(
+             buffer.push_back(L' ');
+             buffer.append(escape_string(arg));
+         }
+-        auto prev_statuses = parser->get_last_statuses();
+ 
+         event_t event(event_type_t::generic);
+         event.desc.str_param1 = L"fish_command_not_found";
+         block_t *b = parser->push_block(block_t::event_block(event));
+         parser->eval(buffer, io);
+         parser->pop_block(b);
+-        parser->set_last_statuses(std::move(prev_statuses));
++
++        return end_execution_reason_t::cancelled;
+     } else {
++        // Redirect to stderr _if there's no handler_
++        io.append_from_specs({redirection_spec_t{STDOUT_FILENO, redirection_mode_t::fd, L"2"}},
++                             L"");
+         // If we have no handler, just print it as a normal error.
+         error = _(L"Unknown command:");
+         if (!event_args.empty()) {
diff --git a/projects/fishshell.com/package.yml b/projects/fishshell.com/package.yml
index 01d8a3b2..7d99d856 100644
--- a/projects/fishshell.com/package.yml
+++ b/projects/fishshell.com/package.yml
@@ -17,6 +17,12 @@ build:
     freedesktop.org/pkg-config: '*'
     git-scm.org: '*'
   script: |
+    # By default, fish's fish_command_not_found handler will redirect to stderr,
+    # return an exit code of 127. Always. This patch fixes it. Hopefully, it will
+    # be merged upstream soon. https://github.com/fish-shell/fish-shell/pull/9517
+
+    git apply props/command_not_found_handler.diff
+
     echo {{version}} >version
 
     mkdir build
@@ -36,7 +42,7 @@ build:
 
 test:
   script:
-    test "$(fish $FIXTURE)" = "variable1variable2variable3variable4variable5variable6variable7variable8variable9variable10"
+    fish $FIXTURE | grep "variable1variable2variable3variable4variable5variable6variable7variable8variable9variable10go version go"
   fixture: |
     #!/usr/bin/env fish
 
@@ -45,6 +51,12 @@ test:
       echo -n $V$x
     end
 
+    begin
+      set -lx SHELL fish
+      tea --magic | source
+      go version
+    end
+
 provides:
   - bin/fish
   - bin/fish_indent