diff --git a/ChangeLog b/ChangeLog
index d91ca40b6..130a37b8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2023-05-11  Bart Schaefer  <schaefer@zsh.org>
 
+	* users/29070: Src/Zle/zle_tricky.c: clean up tokens in cmdstr
+	before attempting completion (compctl only)
+
 	* Jim <linux.tech.guy@gmail.com>: 51609: Doc/Zsh/mod_zselect.yo:
 	fix reference to select(2)
 
diff --git a/Src/Zle/zle_tricky.c b/Src/Zle/zle_tricky.c
index 690cf6efb..6ceb5d87f 100644
--- a/Src/Zle/zle_tricky.c
+++ b/Src/Zle/zle_tricky.c
@@ -1315,6 +1315,8 @@ get_comp_string(void)
 	    ins = (tok == REPEAT ? 2 : (tok != STRING && tok != TYPESET));
 	    zsfree(cmdstr);
 	    cmdstr = ztrdup(tokstr);
+	    untokenize(cmdstr);
+	    remnulargs(cmdstr);
 	    cmdtok = tok;
 	    /*
 	     * If everything before is a redirection, or anything