diff --git a/runtime/src/sandbox.c b/runtime/src/sandbox.c
index 0726fb0..e599d05 100644
--- a/runtime/src/sandbox.c
+++ b/runtime/src/sandbox.c
@@ -329,8 +329,6 @@ current_sandbox_main(void)
 	assert(sandbox->state == SANDBOX_RUNNING);
 	sandbox_set_as_returned(sandbox, SANDBOX_RUNNING);
 
-	software_interrupt_enable();
-
 done:
 	/* Cleanup connection and exit sandbox */
 	sandbox_close_http(sandbox);
diff --git a/runtime/src/worker_thread.c b/runtime/src/worker_thread.c
index ab61445..a5f8d98 100644
--- a/runtime/src/worker_thread.c
+++ b/runtime/src/worker_thread.c
@@ -308,7 +308,7 @@ __attribute__((noreturn)) void
 worker_thread_on_sandbox_exit(struct sandbox *exiting_sandbox)
 {
 	assert(exiting_sandbox);
-	software_interrupt_disable();
+	assert(!software_interrupt_is_enabled());
 	worker_thread_dump_lock_overhead();
 	worker_thread_switch_to_base_context();
 	assert(0);