diff --git a/thefuck/shells/zsh.py b/thefuck/shells/zsh.py
index 79ff89ed..3f8bd80c 100644
--- a/thefuck/shells/zsh.py
+++ b/thefuck/shells/zsh.py
@@ -15,7 +15,7 @@ class Zsh(Generic):
                 " eval $TF_CMD".format(alias_name)
 
         if settings.alter_history:
-            return alias + " ; print -s $TF_CMD'"
+            return alias + " ; test -n \"$TF_CMD\" && print -s $TF_CMD'"
         else:
             return alias + "'"