diff --git a/packages/core/src/composables/useVisibleNodeIds.ts b/packages/core/src/composables/useVisibleNodeIds.ts
deleted file mode 100644
index efd8e62f..00000000
--- a/packages/core/src/composables/useVisibleNodeIds.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Composable for getting the visible node ids from the store.
- *
- * @internal
- * @param onlyRenderVisible
- * @returns array with visible node ids
- */
-export function useVisibleNodeIds(onlyRenderVisible: boolean) {
-  const nodeIds = useStore(useCallback(selector(onlyRenderVisible), [onlyRenderVisible]), shallow)
-
-  return nodeIds
-}
diff --git a/packages/core/src/container/NodeRenderer/NodeRenderer.vue b/packages/core/src/container/NodeRenderer/NodeRenderer.vue
index 7cd7c063..a37684f7 100644
--- a/packages/core/src/container/NodeRenderer/NodeRenderer.vue
+++ b/packages/core/src/container/NodeRenderer/NodeRenderer.vue
@@ -1,38 +1,42 @@
 <script lang="ts" setup>
-import { getCurrentInstance, inject, nextTick, onBeforeUnmount, onMounted, ref, resolveComponent } from 'vue'
-import { whenever } from '@vueuse/core'
+import { getCurrentInstance, inject, nextTick, onBeforeUnmount, onMounted, ref, resolveComponent, watch } from 'vue'
 import { NodeWrapper } from '../../components'
 import type { GraphNode, HandleConnectable, NodeComponent } from '../../types'
 import { Slots } from '../../context'
 import { useVueFlow } from '../../composables'
 import { ErrorCode, VueFlowError } from '../../utils'
-
-const slots = inject(Slots)
+import { useNodesInitialized } from '../../composables/useNodesInitialized'
 
 const {
+  nodes,
   nodesDraggable,
   nodesFocusable,
   elementsSelectable,
   nodesConnectable,
   getNodes,
-  getNodesInitialized,
-  areNodesInitialized,
   getNodeTypes,
   updateNodeDimensions,
   emits,
 } = useVueFlow()
 
+const nodesInitialized = useNodesInitialized()
+
+const slots = inject(Slots)
+
 const resizeObserver = ref<ResizeObserver>()
 
 const instance = getCurrentInstance()
 
-whenever(
-  () => areNodesInitialized.value,
-  () => {
-    nextTick(() => {
-      emits.nodesInitialized(getNodesInitialized.value)
-    })
+watch(
+  nodesInitialized,
+  (initialized) => {
+    if (initialized) {
+      nextTick(() => {
+        emits.nodesInitialized(nodes.value)
+      })
+    }
   },
+  { immediate: true },
 )
 
 onMounted(() => {