diff --git a/share/functions/fish_git_prompt.fish b/share/functions/fish_git_prompt.fish
index cf3623bfa..16b4e4a48 100644
--- a/share/functions/fish_git_prompt.fish
+++ b/share/functions/fish_git_prompt.fish
@@ -802,6 +802,8 @@ function __fish_git_prompt_repaint $varargs --description "Event handler, repain
             for name in cleanstate dirtystate invalidstate stagedstate stashstate stateseparator untrackedfiles upstream_ahead upstream_behind
                 set -e ___fish_git_prompt_char_$name
             end
+            # Clear init so we reset the chars next time.
+            set -e ___fish_git_prompt_init
         end
 
         commandline -f repaint 2>/dev/null