diff --git a/crates/napi/src/bindgen_runtime/js_values/stream/read.rs b/crates/napi/src/bindgen_runtime/js_values/stream/read.rs
index b65d7412..2b5fbb68 100644
--- a/crates/napi/src/bindgen_runtime/js_values/stream/read.rs
+++ b/crates/napi/src/bindgen_runtime/js_values/stream/read.rs
@@ -463,17 +463,14 @@ impl<T: FromNapiValue + 'static> futures_core::Stream for Reader<T> {
         None => return Poll::Ready(None),
       }
     }
+    let waker = cx.waker().clone();
     let state = self.state.clone();
     let state_in_catch = state.clone();
-    let waker = cx.waker().clone();
     self.inner.call_with_return_value(
       Ok(()),
       ThreadsafeFunctionCallMode::NonBlocking,
       move |iterator, _| {
         let iterator = iterator?;
-        let state = state.clone();
-        let state_in_catch = state_in_catch.clone();
-        let waker = waker.clone();
         iterator
           .then(move |cx| {
             if cx.value.done {
diff --git a/crates/napi/src/threadsafe_function.rs b/crates/napi/src/threadsafe_function.rs
index c6edb83d..1729bb29 100644
--- a/crates/napi/src/threadsafe_function.rs
+++ b/crates/napi/src/threadsafe_function.rs
@@ -481,7 +481,7 @@ impl<
   }
 
   /// Call the ThreadsafeFunction, and handle the return value with a callback
-  pub fn call_with_return_value<F: 'static + Fn(Result<Return>, Env) -> Result<()>>(
+  pub fn call_with_return_value<F: 'static + FnOnce(Result<Return>, Env) -> Result<()>>(
     &self,
     value: Result<T, ErrorStatus>,
     mode: ThreadsafeFunctionCallMode,
@@ -590,7 +590,7 @@ impl<
   }
 
   /// Call the ThreadsafeFunction, and handle the return value with a callback
-  pub fn call_with_return_value<F: 'static + Fn(Result<Return>, Env) -> Result<()>>(
+  pub fn call_with_return_value<F: 'static + FnOnce(Result<Return>, Env) -> Result<()>>(
     &self,
     value: T,
     mode: ThreadsafeFunctionCallMode,