diff --git a/share/functions/fish_command_not_found.fish b/share/functions/fish_command_not_found.fish
index 50c98c6b8..db568fd69 100644
--- a/share/functions/fish_command_not_found.fish
+++ b/share/functions/fish_command_not_found.fish
@@ -68,5 +68,9 @@ else if type -q pacman
         __fish_default_command_not_found_handler $argv[1]
         pacman -F $paths
     end
+else
+    # Use standard fish command not found handler otherwise
+    function fish_command_not_found --on-event fish_command_not_found
+        __fish_default_command_not_found_handler $argv
+    end
 end
-# Use standard fish command not found handler otherwise