diff --git a/packages/ciphernode/router/src/e3_request_router.rs b/packages/ciphernode/router/src/e3_request_router.rs
index 835d2ec7..07f3d903 100644
--- a/packages/ciphernode/router/src/e3_request_router.rs
+++ b/packages/ciphernode/router/src/e3_request_router.rs
@@ -143,6 +143,8 @@ impl Handler<EnclaveEvent> for E3RequestRouter {
 
             // Send to bus so all other actors can react to a request being complete.
             self.bus.do_send(event);
+
+            // clean up context
             context.cleanup();
             self.contexts.remove(&e3_id);
         }