diff --git a/src/core/componentStructure.js b/src/core/componentStructure.js
index b827b7a..7321c7b 100644
--- a/src/core/componentStructure.js
+++ b/src/core/componentStructure.js
@@ -30,7 +30,7 @@ class ComponentStructure {
   updated() {
     const { defaultNodes, realList } = this;
     defaultNodes.forEach((node, index) => {
-      addContext(getHtmlElementFromNode(node), {
+      addContext(getHtmlElementFromNode(node) || {}, {
         element: realList[index],
         index
       });
diff --git a/src/vuedraggable.js b/src/vuedraggable.js
index 90c0fea..9e28a52 100644
--- a/src/vuedraggable.js
+++ b/src/vuedraggable.js
@@ -139,7 +139,7 @@ const draggableComponent = defineComponent({
   },
 
   updated() {
-    this.componentStructure.updated();
+    this.$nextTick(() => this.componentStructure.updated());
   },
 
   beforeUnmount() {