diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index b0ce6c85c..564d215fc 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -226,7 +226,7 @@ function __fish_config_interactive -d "Initializations that should be performed
 		end
 	else
 		# Ubuntu Feisty places this command in the regular path instead
-		if which -s command-not-found
+		if which command-not-found > /dev/null 2> /dev/null
 			function fish_command_not_found_handler --on-event fish_command_not_found
 				command-not-found $argv
 			end