diff --git a/packages/react/CHANGELOG.md b/packages/react/CHANGELOG.md
index 0bc7f603..faaa0a57 100644
--- a/packages/react/CHANGELOG.md
+++ b/packages/react/CHANGELOG.md
@@ -1,5 +1,11 @@
 # @xyflow/react
 
+## 12.0.0-next.12
+
+## Patch changes
+
+- fix useNodesData: handle invalid node id thanks @saswatax
+
 ## 12.0.0-next.11
 
 ## Patch changes
diff --git a/packages/system/src/utils/shallow-node-data.ts b/packages/system/src/utils/shallow-node-data.ts
index 2faf1c1a..6bf132b6 100644
--- a/packages/system/src/utils/shallow-node-data.ts
+++ b/packages/system/src/utils/shallow-node-data.ts
@@ -2,7 +2,11 @@ import { NodeBase } from '../types';
 
 type NodeData = Pick<NodeBase, 'id' | 'type' | 'data'>;
 
-export function shallowNodeData(a: NodeData | NodeData[], b: NodeData | NodeData[]) {
+export function shallowNodeData(a: NodeData | NodeData[] | null, b: NodeData | NodeData[] | null) {
+  if (a === null || b === null) {
+    return false;
+  }
+
   const _a = Array.isArray(a) ? a : [a];
   const _b = Array.isArray(b) ? b : [b];