diff --git a/crates/nu-plugin-engine/src/context.rs b/crates/nu-plugin-engine/src/context.rs
index d9023cde35..160ce802b2 100644
--- a/crates/nu-plugin-engine/src/context.rs
+++ b/crates/nu-plugin-engine/src/context.rs
@@ -257,12 +257,9 @@ impl<'a> PluginExecutionContext for PluginExecutionCommandContext<'a> {
             }
         }
 
-        decl.run(
-            &self.engine_state,
-            stack,
-            &(&call_builder.finish()).into(),
-            input,
-        )
+        call_builder.with(stack, |stack, call| {
+            decl.run(&self.engine_state, stack, call, input)
+        })
     }
 
     fn boxed(&self) -> Box<dyn PluginExecutionContext + 'static> {