diff --git a/.changeset/large-actors-tap.md b/.changeset/large-actors-tap.md
new file mode 100644
index 00000000..8967c09e
--- /dev/null
+++ b/.changeset/large-actors-tap.md
@@ -0,0 +1,5 @@
+---
+'@vue-flow/core': patch
+---
+
+Fix props being undefined on first render of custom node and edge components
diff --git a/.changeset/sixty-lions-tell.md b/.changeset/sixty-lions-tell.md
new file mode 100644
index 00000000..c5f86e56
--- /dev/null
+++ b/.changeset/sixty-lions-tell.md
@@ -0,0 +1,5 @@
+---
+'@vue-flow/core': patch
+---
+
+Remove `nodes` property from `ConnectionLineProps` - use `getNodes` inside the component instead ⚠️