diff --git a/src/hyperlight_host/src/hypervisor/hypervisor_handler.rs b/src/hyperlight_host/src/hypervisor/hypervisor_handler.rs
index 4e49a66c0..d0fbd84b5 100644
--- a/src/hyperlight_host/src/hypervisor/hypervisor_handler.rs
+++ b/src/hyperlight_host/src/hypervisor/hypervisor_handler.rs
@@ -323,7 +323,6 @@ impl HypervisorHandler {
                                     // call.
                                     execution_variables.set_thread_id(unsafe { pthread_self() })?;
                                 }
-                                execution_variables.running.store(true, Ordering::SeqCst);
 
                                 #[cfg(target_os = "linux")]
                                 execution_variables.run_cancelled.store(false);
@@ -392,9 +391,6 @@ impl HypervisorHandler {
                             HypervisorHandlerAction::DispatchCallFromHost(function_name) => {
                                 let hv = hv.as_mut().ok_or_else(|| new_error!("Hypervisor not initialized"))?;
 
-                                // Lock to indicate an action is being performed in the hypervisor
-                                execution_variables.running.store(true, Ordering::SeqCst);
-
                                 #[cfg(target_os = "linux")]
                                 execution_variables.run_cancelled.store(false);
 
@@ -599,6 +595,7 @@ impl HypervisorHandler {
             // `TerminateHandlerThread`.
         }
 
+        self.set_running(true);
         self.communication_channels
             .to_handler_tx
             .send(hypervisor_handler_action)