diff --git a/source/ecs/manager.d b/source/ecs/manager.d
index 3318d9e..b5636b3 100644
--- a/source/ecs/manager.d
+++ b/source/ecs/manager.d
@@ -330,7 +330,10 @@ export class EntityManager
                                     "optional");
                         static if (is_optional)
                         {
-                            event_field = null;
+                            if(info.deltas[EventFieldType.component_id] != 0)event_field = cast(EventFieldType*)(cast(void*) data.block
+                                    + info.deltas[EventFieldType.component_id]
+                                    + data.id * EventFieldType.sizeof);
+                            else event_field = null;
                         }
                         else
                         {