diff --git a/share/config.fish b/share/config.fish
index d2de7407c..c0b663065 100644
--- a/share/config.fish
+++ b/share/config.fish
@@ -8,11 +8,6 @@ set -g IFS \n\ \t
 set -qg __fish_added_user_paths
 or set -g __fish_added_user_paths
 
-# For one-off upgrades of the fish version, see __fish_config_interactive.fish
-if not set -q __fish_initialized
-    set -U __fish_initialized 0
-end
-
 #
 # Create the default command_not_found handler
 #
diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index f2ac17ec8..0eda18793 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -9,6 +9,11 @@ function __fish_config_interactive -d "Initializations that should be performed
         return
     end
 
+    # For one-off upgrades of the fish version
+    if not set -q __fish_initialized
+        set -U __fish_initialized 0
+    end
+
     set -g __fish_config_interactive_done
     set -g __fish_active_key_bindings