diff --git a/src/container/EdgeRenderer/EdgeRenderer.vue b/src/container/EdgeRenderer/EdgeRenderer.vue
index 77123626..52d81d75 100644
--- a/src/container/EdgeRenderer/EdgeRenderer.vue
+++ b/src/container/EdgeRenderer/EdgeRenderer.vue
@@ -43,8 +43,8 @@ export default {
     <MarkerDefinitions :color="store.arrowHeadColor" />
     <g :transform="transform">
       <EdgeWrapper
-        v-for="(edge, i) of store.getEdges"
-        :key="`${edge.id}-${i}`"
+        v-for="edge of store.getEdges"
+        :key="edge.id"
         :edge="edge"
         :component="getType(edge.type)"
         :selectable="store.elementsSelectable"
diff --git a/src/container/NodeRenderer/NodeRenderer.vue b/src/container/NodeRenderer/NodeRenderer.vue
index 3a764878..8209caba 100644
--- a/src/container/NodeRenderer/NodeRenderer.vue
+++ b/src/container/NodeRenderer/NodeRenderer.vue
@@ -25,8 +25,8 @@ export default {
 <template>
   <div class="vue-flow__nodes" :style="{ transform }">
     <NodeWrapper
-      v-for="(node, i) of store.getNodes"
-      :key="`${node.id}-${i}`"
+      v-for="node of store.getNodes"
+      :key="node.id"
       :node="node"
       :component="getType(node.type)"
       :draggable="typeof node.draggable === 'undefined' ? store.nodesDraggable : node.draggable"