diff --git a/share/config.fish.in b/share/config.fish.in
index 7681cc1ea..085d8a85e 100644
--- a/share/config.fish.in
+++ b/share/config.fish.in
@@ -98,8 +98,10 @@ end
 #
 # Whenever a prompt is displayed, make sure that interactive
 # mode-specific initializations have been performed.
+# This handler removes itself after it is first called.
 #
 function __fish_on_interactive --on-event fish_prompt
 	__fish_config_interactive
+	functions -e __fish_on_interactive
 end