diff --git a/package/src/components/Edges/EdgeWrapper.vue b/package/src/components/Edges/EdgeWrapper.vue
index 44002a6a..400130c0 100644
--- a/package/src/components/Edges/EdgeWrapper.vue
+++ b/package/src/components/Edges/EdgeWrapper.vue
@@ -117,10 +117,6 @@ onMounted(() => {
   )
 })
 
-onUnmounted(() => {
-  edge.value = null
-})
-
 const slots = inject(Slots)
 
 const name = ref(edge.value.type ?? 'default')
diff --git a/package/src/components/Nodes/NodeWrapper.vue b/package/src/components/Nodes/NodeWrapper.vue
index fc665461..29b6b13f 100644
--- a/package/src/components/Nodes/NodeWrapper.vue
+++ b/package/src/components/Nodes/NodeWrapper.vue
@@ -97,7 +97,6 @@ watch(
 
 onUnmounted(() => {
   nodeElement.value = undefined
-  node.value = null
 })
 
 store.updateNodePosition({ id: node.value.id, diff: { x: 0, y: 0 } })
diff --git a/package/src/container/NodeRenderer/NodeRenderer.vue b/package/src/container/NodeRenderer/NodeRenderer.vue
index 97ac4ecd..8a878532 100644
--- a/package/src/container/NodeRenderer/NodeRenderer.vue
+++ b/package/src/container/NodeRenderer/NodeRenderer.vue
@@ -1,22 +1,14 @@
 <script lang="ts" setup>
 import NodeWrapper from '../../components/Nodes/NodeWrapper.vue'
-import { GraphNode, SnapGrid } from '../../types'
+import { SnapGrid } from '../../types'
+import { useVueFlow } from '../../composables'
 
-interface Props {
-  draggable?: boolean
-  selectable?: boolean
-  connectable?: boolean
-  snapToGrid?: boolean
-  snapGrid?: SnapGrid
-  nodes: GraphNode[]
-}
+const { store } = useVueFlow()
 
-const props = defineProps<Props>()
-
-const draggable = (d?: boolean) => (typeof d === 'undefined' ? props.draggable : d)
-const selectable = (s?: boolean) => (typeof s === 'undefined' ? props.selectable : s)
-const connectable = (c?: boolean) => (typeof c === 'undefined' ? props.connectable : c)
-const snapGrid = (sg?: SnapGrid) => (sg ?? props.snapToGrid ? props.snapGrid : undefined)
+const draggable = (d?: boolean) => (typeof d === 'undefined' ? store.nodesDraggable : d)
+const selectable = (s?: boolean) => (typeof s === 'undefined' ? store.elementsSelectable : s)
+const connectable = (c?: boolean) => (typeof c === 'undefined' ? store.nodesConnectable : c)
+const snapGrid = (sg?: SnapGrid) => (sg ?? store.snapToGrid ? store.snapGrid : undefined)
 </script>
 <script lang="ts">
 export default {
@@ -26,7 +18,7 @@ export default {
 <template>
   <div class="vue-flow__nodes vue-flow__container">
     <NodeWrapper
-      v-for="node of props.nodes"
+      v-for="node of store.getNodes"
       :id="node.id"
       :key="node.id"
       :node="node"