diff --git a/packages/core/src/container/NodeRenderer/NodeRenderer.vue b/packages/core/src/container/NodeRenderer/NodeRenderer.vue
index fc42a184..9ba9816f 100644
--- a/packages/core/src/container/NodeRenderer/NodeRenderer.vue
+++ b/packages/core/src/container/NodeRenderer/NodeRenderer.vue
@@ -24,11 +24,11 @@ const focusable = (f?: boolean) => (typeof f === 'undefined' ? nodesFocusable :
 
 let resizeObserver = $ref<ResizeObserver>()
 
-until(() => getNodesInitialized.length === nodes.length)
+until(() => nodes.length > 0 && getNodesInitialized.length === nodes.length)
   .toBe(true)
   .then(() => {
     nextTick(() => {
-      emits.nodesInitialized()
+      emits.nodesInitialized(getNodesInitialized)
     })
   })
 
diff --git a/packages/core/src/types/hooks.ts b/packages/core/src/types/hooks.ts
index d0bba340..bccfb35a 100644
--- a/packages/core/src/types/hooks.ts
+++ b/packages/core/src/types/hooks.ts
@@ -45,7 +45,7 @@ export interface FlowEvents {
   nodeDragStart: NodeDragEvent
   nodeDrag: NodeDragEvent
   nodeDragStop: NodeDragEvent
-  nodesInitialized: void
+  nodesInitialized: GraphNode[]
   updateNodeInternals: string[]
   miniMapNodeClick: NodeMouseEvent
   miniMapNodeDoubleClick: NodeMouseEvent