diff --git a/src/components/Nodes/NodeWrapper.vue b/src/components/Nodes/NodeWrapper.vue
index f34a9795..f3e328c8 100644
--- a/src/components/Nodes/NodeWrapper.vue
+++ b/src/components/Nodes/NodeWrapper.vue
@@ -3,20 +3,19 @@ import { DraggableEventListener, DraggableCore } from '@braks/revue-draggable'
 import { useVueFlow } from '../../composables'
 import { GraphNode, NodeComponent, SnapGrid } from '../../types'
 import { NodeId } from '../../context'
-import { getDimensions, getHandleBounds, getXYZPos } from '../../utils'
+import { getXYZPos } from '../../utils'
 
 interface NodeWrapperProps {
   node: GraphNode
+  type: NodeComponent
+  draggable: boolean
+  selectable: boolean
+  connectable: boolean
   snapGrid?: SnapGrid
-  component?: NodeComponent
-  draggable?: boolean
-  selectable?: boolean
-  connectable?: boolean
 }
 
 const props = defineProps<NodeWrapperProps>()
-const emit = defineEmits(['update:node'])
-const node = useVModel(props, 'node', emit)
+const node = useVModel(props, 'node')
 const { id, store } = useVueFlow()
 provide(NodeId, props.node.id)
 
@@ -139,13 +138,6 @@ export default {
         zIndex: node.dragging || node.selected ? 1000 : node.computedPosition.z,
         transform: `translate(${node.computedPosition.x}px,${node.computedPosition.y}px)`,
         pointerEvents: props.selectable || props.draggable ? 'all' : 'none',
-        opacity:
-          store.dimensions.width !== 0 &&
-          store.dimensions.height !== 0 &&
-          node.dimensions.width !== 0 &&
-          node.dimensions.height !== 0
-            ? 1
-            : 0,
         ...node.style,
       }"
       :data-id="node.id"
@@ -158,17 +150,29 @@ export default {
     >
       <slot
         v-bind="{
-          nodeElement,
-          connectable: props.connectable,
-          ...removeEmpty(node),
+          ...node,
+            nodeElement,
+            connectable: props.connectable,
+            draggable: props.draggable,
+            selectable: props.selectable,
+            zIndex: node.dragging || node.selected ? 1000 : node.computedPosition.z,
+            selected: !!node.selected,
+            hidden: !!node.hidden,
+            dragging: !!node.dragging,
         }"
       >
         <component
-          :is="props.component ?? node.type"
+          :is="props.type ?? node.type"
           v-bind="{
+            ...node,
             nodeElement,
             connectable: props.connectable,
-            ...removeEmpty(node),
+            draggable: props.draggable,
+            selectable: props.selectable,
+            zIndex: node.dragging || node.selected ? 1000 : node.computedPosition.z,
+            selected: !!node.selected,
+            hidden: !!node.hidden,
+            dragging: !!node.dragging,
           }"
         />
       </slot>
diff --git a/src/container/NodeRenderer/NodeRenderer.vue b/src/container/NodeRenderer/NodeRenderer.vue
index f6091e72..4c0d4e6b 100644
--- a/src/container/NodeRenderer/NodeRenderer.vue
+++ b/src/container/NodeRenderer/NodeRenderer.vue
@@ -27,10 +27,10 @@ export default {
       v-for="node of store.getNodes"
       :key="node.id"
       :node="node"
-      :component="getType(node.type)"
-      :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"
+      :type="getType(node.type)"
+      :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="snapGrid(node)"
     >
       <template #default="nodeProps">
diff --git a/src/store/getters.ts b/src/store/getters.ts
index b9d0f16a..dfe722d1 100644
--- a/src/store/getters.ts
+++ b/src/store/getters.ts
@@ -47,7 +47,9 @@ export default (state: State): ComputedGetters => {
   const getEdges = computed<GraphEdge[]>(() => {
     if (state.paneReady && state.dimensions.width && state.dimensions.height) {
       if (!state.onlyRenderVisibleElements)
-        return state.edges.filter((e) => !e.hidden && !e.targetNode.hidden && !e.sourceNode.hidden)
+        return state.edges.filter(
+          (e) => !e.hidden && e.targetNode && !e.targetNode.hidden && e.sourceNode && !e.sourceNode.hidden,
+        )
       else
         return state.edges.filter(
           (e) =>