diff --git a/zshenv b/zshenv
index 7862607..a8dda97 100644
--- a/zshenv
+++ b/zshenv
@@ -16,7 +16,7 @@ HISTSIZE=20000
 SAVEHIST=20000
 
 # Migrate histfile from cache to state directory
-[ -f $HOME/.cache/zsh/histfile ] && \
+! [ -f $HISTFILE ] && [ -f $HOME/.cache/zsh/histfile ] && \
   mv $HOME/.cache/zsh/histfile \
      ${XDG_STATE_HOME:-$HOME/.local/state}/zsh/histfile