diff --git a/apis/rust/node/src/event_stream/thread.rs b/apis/rust/node/src/event_stream/thread.rs
index add58e3e..dcd40245 100644
--- a/apis/rust/node/src/event_stream/thread.rs
+++ b/apis/rust/node/src/event_stream/thread.rs
@@ -60,7 +60,14 @@ impl Drop for EventStreamThreadHandle {
         if self.handle.is_empty() {
             tracing::trace!("waiting for event stream thread");
         }
-        match self.handle.recv_timeout(Duration::from_secs(20)) {
+
+        // TODO: The event stream duration has been shorten due to
+        // Python Reference Counting not working properly and deleting the node
+        // before deleting event creating a race condition.
+        //
+        // In the future, we hope to fix this issue so that
+        // the event stream can be properly waited for every time.
+        match self.handle.recv_timeout(Duration::from_secs(1)) {
             Ok(Ok(())) => {
                 tracing::trace!("event stream thread finished");
             }