diff --git a/packages/core/src/composables/useEdgeHooks.ts b/packages/core/src/composables/useEdgeHooks.ts
index d2bd55e6..d00b8b3c 100644
--- a/packages/core/src/composables/useEdgeHooks.ts
+++ b/packages/core/src/composables/useEdgeHooks.ts
@@ -17,47 +17,47 @@ export default function useEdgeHooks(edge: GraphEdge, emits: VueFlowStore['emits
 
   edgeHooks.doubleClick.on((event) => {
     emits.edgeDoubleClick(event)
-    edge.events.doubleClick?.(event)
+    edge.events?.doubleClick?.(event)
   })
 
   edgeHooks.click.on((event) => {
     emits.edgeClick(event)
-    edge.events.click?.(event)
+    edge.events?.click?.(event)
   })
 
   edgeHooks.mouseEnter.on((event) => {
     emits.edgeMouseEnter(event)
-    edge.events.mouseEnter?.(event)
+    edge.events?.mouseEnter?.(event)
   })
 
   edgeHooks.mouseMove.on((event) => {
     emits.edgeMouseMove(event)
-    edge.events.mouseMove?.(event)
+    edge.events?.mouseMove?.(event)
   })
 
   edgeHooks.mouseLeave.on((event) => {
     emits.edgeMouseLeave(event)
-    edge.events.mouseLeave?.(event)
+    edge.events?.mouseLeave?.(event)
   })
 
   edgeHooks.contextMenu.on((event) => {
     emits.edgeContextMenu(event)
-    edge.events.contextMenu?.(event)
+    edge.events?.contextMenu?.(event)
   })
 
   edgeHooks.updateStart.on((event) => {
     emits.edgeUpdateStart(event)
-    edge.events.updateStart?.(event)
+    edge.events?.updateStart?.(event)
   })
 
   edgeHooks.update.on((event) => {
     emits.edgeUpdate(event)
-    edge.events.update?.(event)
+    edge.events?.update?.(event)
   })
 
   edgeHooks.updateEnd.on((event) => {
     emits.edgeUpdateEnd(event)
-    edge.events.updateEnd?.(event)
+    edge.events?.updateEnd?.(event)
   })
 
   return Object.entries(edgeHooks).reduce(
diff --git a/packages/core/src/composables/useNodeHooks.ts b/packages/core/src/composables/useNodeHooks.ts
index cc6366b6..dd29add6 100644
--- a/packages/core/src/composables/useNodeHooks.ts
+++ b/packages/core/src/composables/useNodeHooks.ts
@@ -17,47 +17,47 @@ export default function useNodeHooks(node: GraphNode, emits: VueFlowStore['emits
 
   nodeHooks.doubleClick.on((event) => {
     emits.nodeDoubleClick(event)
-    node.events.doubleClick?.(event)
+    node.events?.doubleClick?.(event)
   })
 
   nodeHooks.click.on((event) => {
     emits.nodeClick(event)
-    node.events.click?.(event)
+    node.events?.click?.(event)
   })
 
   nodeHooks.mouseEnter.on((event) => {
     emits.nodeMouseEnter(event)
-    node.events.mouseEnter?.(event)
+    node.events?.mouseEnter?.(event)
   })
 
   nodeHooks.mouseMove.on((event) => {
     emits.nodeMouseMove(event)
-    node.events.mouseMove?.(event)
+    node.events?.mouseMove?.(event)
   })
 
   nodeHooks.mouseLeave.on((event) => {
     emits.nodeMouseLeave(event)
-    node.events.mouseLeave?.(event)
+    node.events?.mouseLeave?.(event)
   })
 
   nodeHooks.contextMenu.on((event) => {
     emits.nodeContextMenu(event)
-    node.events.contextMenu?.(event)
+    node.events?.contextMenu?.(event)
   })
 
   nodeHooks.dragStart.on((event) => {
     emits.nodeDragStart(event)
-    node.events.dragStart?.(event)
+    node.events?.dragStart?.(event)
   })
 
   nodeHooks.drag.on((event) => {
     emits.nodeDrag(event)
-    node.events.drag?.(event)
+    node.events?.drag?.(event)
   })
 
   nodeHooks.dragStop.on((event) => {
     emits.nodeDragStop(event)
-    node.events.dragStop?.(event)
+    node.events?.dragStop?.(event)
   })
 
   return Object.entries(nodeHooks).reduce(