diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8431635..c241561 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
+- zsh: Space-Tab completion repeating output multiple times when matching single directory in history
 - fish: detect infinite loop when using `alias cd=z`.
 - fish / Nushell / PowerShell: handle queries that look like args (e.g. `z -x`).
 
diff --git a/templates/zsh.txt b/templates/zsh.txt
index b574f38..684e2ef 100644
--- a/templates/zsh.txt
+++ b/templates/zsh.txt
@@ -119,6 +119,7 @@ if [[ -o zle ]]; then
         if [[ -n "${__zoxide_result}" ]]; then
             # shellcheck disable=SC2034,SC2296
             BUFFER="{{ cmd }} ${(q-)__zoxide_result}"
+            __zoxide_result=''
             \builtin zle reset-prompt
             \builtin zle accept-line
         else