diff --git a/pkg/pipeline/pipelinemgr.py b/pkg/pipeline/pipelinemgr.py
index 83faaee3..b32ad98d 100644
--- a/pkg/pipeline/pipelinemgr.py
+++ b/pkg/pipeline/pipelinemgr.py
@@ -199,7 +199,7 @@ class RuntimePipeline:
 
             event_ctx_result = await self.ap.plugin_connector.handler.emit_event(event_ctx_data)
 
-            event_ctx.update(**event_ctx_result)
+            event_ctx = event_context.EventContext.parse_from_dict(event_ctx_result['event_context'])
 
             if event_ctx.is_prevented_default():
                 return
diff --git a/pkg/plugin/handler.py b/pkg/plugin/handler.py
index 7a6a299f..42734261 100644
--- a/pkg/plugin/handler.py
+++ b/pkg/plugin/handler.py
@@ -87,4 +87,4 @@ class RuntimeConnectionHandler(handler.Handler):
             timeout=10,
         )
 
-        return result['event_context']
+        return result