diff --git a/src/strategies/completion.zsh b/src/strategies/completion.zsh
index 0808575..a23b630 100644
--- a/src/strategies/completion.zsh
+++ b/src/strategies/completion.zsh
@@ -100,9 +100,11 @@ _zsh_autosuggest_capture_completion() {
 
 	# The completion result is surrounded by null bytes, so read the
 	# content between the first two null bytes.
-	zpty -r $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME line '*'$'\0'
-	zpty -r $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME line '*'$'\0'
-	completion="${line%$'\0'}"
+	zpty -r $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME line '*'$'\0''*'$'\0'
+
+	# On older versions of zsh, we sometimes get extra bytes after the
+	# second null byte, so trim those off the end
+	completion="${${${(M)line:#*$'\0'*$'\0'*}#*$'\0'}%%$'\0'*}"
 
 	# Destroy the pty
 	zpty -d $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME
diff --git a/zsh-autosuggestions.zsh b/zsh-autosuggestions.zsh
index da10235..6683262 100644
--- a/zsh-autosuggestions.zsh
+++ b/zsh-autosuggestions.zsh
@@ -597,9 +597,11 @@ _zsh_autosuggest_capture_completion() {
 
 	# The completion result is surrounded by null bytes, so read the
 	# content between the first two null bytes.
-	zpty -r $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME line '*'$'\0'
-	zpty -r $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME line '*'$'\0'
-	completion="${line%$'\0'}"
+	zpty -r $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME line '*'$'\0''*'$'\0'
+
+	# On older versions of zsh, we sometimes get extra bytes after the
+	# second null byte, so trim those off the end
+	completion="${${${(M)line:#*$'\0'*$'\0'*}#*$'\0'}%%$'\0'*}"
 
 	# Destroy the pty
 	zpty -d $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME