diff --git a/package/src/components/Nodes/NodeWrapper.vue b/package/src/components/Nodes/NodeWrapper.vue
index 009b710f..b0a91ec6 100644
--- a/package/src/components/Nodes/NodeWrapper.vue
+++ b/package/src/components/Nodes/NodeWrapper.vue
@@ -1,12 +1,13 @@
 <script lang="ts" setup>
-import { DraggableEventListener, DraggableCore } from '@braks/revue-draggable'
+import { DraggableEventListener, DraggableCore } from '@braks/revue-draggable/src/index'
 import { useVueFlow } from '../../composables'
-import { NodeComponent, SnapGrid } from '../../types'
-import { NodeId, Slots } from '../../context'
+import { SnapGrid } from '../../types'
+import { NodeId } from '../../context'
 import { getXYZPos } from '../../utils'
 
 interface NodeWrapperProps {
   id: string
+  name: string
   draggable: boolean
   selectable: boolean
   connectable: boolean
@@ -107,44 +108,11 @@ watch(
 )
 
 store.updateNodePosition({ id: node.value.id, diff: { x: 0, y: 0 } })
-
-const slots = inject(Slots)
-
-const name = ref(node.value.type ?? 'default')
-watch(
-  () => node.value.type,
-  (v) => v && (name.value = v),
-)
-
-const type = computed(() => {
-  const instance = getCurrentInstance()
-  let nodeType = store.getNodeTypes[name.value]
-  if (typeof nodeType === 'string') {
-    if (instance) {
-      const components = Object.keys(instance.appContext.components)
-      if (components && components.includes(name.value)) {
-        nodeType = resolveComponent(name.value, false) as NodeComponent
-      }
-    }
-  }
-  if (typeof nodeType !== 'string') return nodeType
-
-  const slot = slots?.[`node-${name.value}`]?.({})
-  if (!slot) {
-    console.warn(`[vueflow]: Node type "${node.value.type}" not found and no node-slot detected. Using fallback type "default".`)
-    name.value = 'default'
-    return store.getNodeTypes.default
-  }
-  if (slot.length > 1) {
-    console.warn('[vue-flow]: More than one element in node-slot detected. Using fallback to first slot item.')
-  }
-
-  return slot[0]
-})
 </script>
 <script lang="ts">
 export default {
   name: 'Node',
+  inheritAttrs: false,
 }
 </script>
 <template>
@@ -164,7 +132,7 @@ export default {
       :key="`node-${node.id}`"
       :class="[
         'vue-flow__node',
-        `vue-flow__node-${name}`,
+        `vue-flow__node-${props.name}`,
         store.noPanClassName,
         {
           dragging: node.dragging,
@@ -187,8 +155,7 @@ export default {
       @click="onSelectNodeHandler"
       @dblclick="onDoubleClick"
     >
-      <component
-        :is="type"
+      <slot
         v-bind="{
           nodeElement,
           id: node.id,
diff --git a/package/src/container/NodeRenderer/NodeRenderer.vue b/package/src/container/NodeRenderer/NodeRenderer.vue
index 6c6d9234..86530862 100644
--- a/package/src/container/NodeRenderer/NodeRenderer.vue
+++ b/package/src/container/NodeRenderer/NodeRenderer.vue
@@ -1,8 +1,41 @@
 <script lang="ts" setup>
 import NodeWrapper from '../../components/Nodes/NodeWrapper.vue'
 import { useVueFlow } from '../../composables'
+import { NodeComponent } from '../../types'
+import { Slots } from '../../context'
 
 const { store } = useVueFlow()
+const slots = inject(Slots)
+
+const names: Record<string, string> = reactive({})
+
+const getType = (name = 'default') => {
+  const instance = getCurrentInstance()
+  let nodeType = store.getNodeTypes[name]
+  if (typeof nodeType === 'string') {
+    if (instance) {
+      const components = Object.keys(instance.appContext.components)
+      if (components && components.includes(name)) {
+        nodeType = resolveComponent(name, false) as NodeComponent
+      }
+    }
+  }
+
+  if (typeof nodeType !== 'string') {
+    names[name] = name
+    return nodeType
+  }
+
+  const slot = slots?.[`node-${name}`]
+  if (!slot?.({})) {
+    console.warn(`[vueflow]: Node type "${name}" not found and no node-slot detected. Using fallback type "default".`)
+    names[name] = 'default'
+    return store.getNodeTypes.default
+  }
+
+  names[name] = name
+  return slot
+}
 </script>
 <script lang="ts">
 export default {
@@ -15,10 +48,15 @@ export default {
       v-for="node of store.getNodes"
       :id="node.id"
       :key="`vue-flow__node-${node.id}`"
+      :name="names[node.type] || 'default'"
       :draggable="typeof node.draggable === 'undefined' ? store.nodesDraggable : !!node.draggable"
       :selectable="typeof node.selectable === 'undefined' ? store.elementsSelectable : !!node.selectable"
       :connectable="typeof node.connectable === 'undefined' ? store.nodesConnectable : !!node.connectable"
       :snap-grid="node.snapGrid ?? (store.snapToGrid ? store.snapGrid : undefined)"
-    />
+    >
+      <template #default="props">
+        <component :is="getType(node.type)" v-bind="props" />
+      </template>
+    </NodeWrapper>
   </div>
 </template>