diff --git a/share/functions/fish_vi_key_bindings.fish b/share/functions/fish_vi_key_bindings.fish
index 4cde94038..910e1532e 100644
--- a/share/functions/fish_vi_key_bindings.fish
+++ b/share/functions/fish_vi_key_bindings.fish
@@ -427,9 +427,11 @@ function fish_vi_key_bindings --description 'vi-like key bindings for fish'
         end
     end
     function __fish_vi_key_bindings_remove_handlers --on-variable __fish_active_key_bindings
-        __fish_vi_cursor fish_cursor_default
         functions --erase __fish_vi_key_bindings_remove_handlers
         functions --erase __fish_vi_key_bindings_on_mode_change
+        if type -q __fish_vi_cursor
+            __fish_vi_cursor fish_cursor_default
+        end
         functions --erase fish_vi_cursor_handle
         functions --erase fish_vi_cursor_handle_preexec
         set -e -g fish_cursor_end_mode