diff --git a/runtime/include/sandbox_set_as_returned.h b/runtime/include/sandbox_set_as_returned.h
index fabc576..7a04ed1 100644
--- a/runtime/include/sandbox_set_as_returned.h
+++ b/runtime/include/sandbox_set_as_returned.h
@@ -34,8 +34,6 @@ sandbox_set_as_returned(struct sandbox *sandbox, sandbox_state_t last_state)
 		sandbox->total_time            = now - sandbox->timestamp_of.request_arrival;
 		local_runqueue_delete(sandbox);
 		sandbox_free_linear_memory(sandbox);
-		http_session_free(sandbox->http);
-		sandbox->http = NULL;
 		break;
 	}
 	default: {
diff --git a/runtime/src/sandbox.c b/runtime/src/sandbox.c
index 4fdf06e..b488d08 100644
--- a/runtime/src/sandbox.c
+++ b/runtime/src/sandbox.c
@@ -202,14 +202,13 @@ sandbox_deinit(struct sandbox *sandbox)
 
 	module_release(sandbox->module);
 
-	/* HTTP Session was already deinited, freed, and set to NULL */
 	/* Linear Memory and Guard Page should already have been munmaped and set to NULL */
 	assert(sandbox->memory == NULL);
 
 	if (likely(sandbox->stack != NULL)) sandbox_free_stack(sandbox);
 	if (likely(sandbox->http != NULL)) http_session_free(sandbox->http);
-
 	if (likely(sandbox->globals.buffer != NULL)) sandbox_free_globals(sandbox);
+	if (likely(sandbox->wasi_context != NULL)) wasi_context_destroy(sandbox->wasi_context);
 }
 
 /**