diff --git a/clap_complete/src/env/shells.rs b/clap_complete/src/env/shells.rs
index a46d5d439ee..1f8e1d179d6 100644
--- a/clap_complete/src/env/shells.rs
+++ b/clap_complete/src/env/shells.rs
@@ -160,7 +160,10 @@ set edit:completion:arg-completer[BIN] = { |@words|
     var index = (count $words)
     set index = (- $index 1)
 
-    put (env _CLAP_IFS="\n" _CLAP_COMPLETE_INDEX=(to-string $index) VAR="elvish" COMPLETER -- $@words) | to-lines
+    tmp E:_CLAP_IFS = "\n"
+    tmp E:_CLAP_COMPLETE_INDEX = (to-string $index)
+    tmp E:VAR = "elvish"
+    put (COMPLETER -- $@words) | to-lines
 }
 "#
         .replace("COMPLETER", &completer)
diff --git a/clap_complete/tests/snapshots/home/dynamic-env/exhaustive/elvish/elvish/rc.elv b/clap_complete/tests/snapshots/home/dynamic-env/exhaustive/elvish/elvish/rc.elv
index 56fc3985798..ececbd87bfe 100644
--- a/clap_complete/tests/snapshots/home/dynamic-env/exhaustive/elvish/elvish/rc.elv
+++ b/clap_complete/tests/snapshots/home/dynamic-env/exhaustive/elvish/elvish/rc.elv
@@ -5,7 +5,10 @@ set edit:completion:arg-completer[exhaustive] = { |@words|
     var index = (count $words)
     set index = (- $index 1)
 
-    put (env _CLAP_IFS="\n" _CLAP_COMPLETE_INDEX=(to-string $index) COMPLETE="elvish" exhaustive -- $@words) | to-lines
+    tmp E:_CLAP_IFS = "\n"
+    tmp E:_CLAP_COMPLETE_INDEX = (to-string $index)
+    tmp E:COMPLETE = "elvish"
+    put (exhaustive -- $@words) | to-lines
 }