diff --git a/packages/tree/src/Tree.tsx b/packages/tree/src/Tree.tsx
index e9920392f..093e03feb 100644
--- a/packages/tree/src/Tree.tsx
+++ b/packages/tree/src/Tree.tsx
@@ -69,7 +69,7 @@ const InnerTree = <Datum,>({
         partialMargin
     )
 
-    const { nodes, links, linkGenerator, setCurrentNode } = useTree<Datum>({
+    const { nodes, nodeByUid, links, linkGenerator, setCurrentNode } = useTree<Datum>({
         data,
         identity,
         layout,
@@ -171,13 +171,14 @@ const InnerTree = <Datum,>({
     const customLayerProps: CustomLayerProps<Datum> = useMemo(
         () => ({
             nodes,
+            nodeByUid,
             links,
             innerWidth,
             innerHeight,
             linkGenerator,
             setCurrentNode,
         }),
-        [nodes, links, innerWidth, innerHeight, linkGenerator, setCurrentNode]
+        [nodes, nodeByUid, links, innerWidth, innerHeight, linkGenerator, setCurrentNode]
     )
 
     return (
diff --git a/packages/tree/src/hooks.ts b/packages/tree/src/hooks.ts
index 25859c991..1e4e5d68c 100644
--- a/packages/tree/src/hooks.ts
+++ b/packages/tree/src/hooks.ts
@@ -509,6 +509,7 @@ export const useTree = <Datum = DefaultDatum>({
 
     return {
         nodes,
+        nodeByUid,
         links,
         linkGenerator,
         setCurrentNode,
diff --git a/packages/tree/src/types.ts b/packages/tree/src/types.ts
index 0ef589972..37a14b157 100644
--- a/packages/tree/src/types.ts
+++ b/packages/tree/src/types.ts
@@ -159,6 +159,7 @@ export type LabelComponent<Datum> = FunctionComponent<LabelComponentProps<Datum>
 
 export interface CustomLayerProps<Datum> {
     nodes: readonly ComputedNode<Datum>[]
+    nodeByUid: Record<string, ComputedNode<Datum>>
     links: readonly ComputedLink<Datum>[]
     innerWidth: number
     innerHeight: number