diff --git a/src/frontend/src/components/forms/fields/TreeField.tsx b/src/frontend/src/components/forms/fields/TreeField.tsx
index f07834019b..a34a3c4a05 100644
--- a/src/frontend/src/components/forms/fields/TreeField.tsx
+++ b/src/frontend/src/components/forms/fields/TreeField.tsx
@@ -170,10 +170,11 @@ export function TreeField({
   const onChange = useCallback(
     (val: string | null) => {
       const pk = val ? Number.parseInt(val, 10) : null;
+      const raw = val ? (nodeMap[val] ?? {}) : {};
       field.onChange(pk);
-      definition.onValueChange?.(pk);
+      definition.onValueChange?.(pk, raw);
     },
-    [field, definition]
+    [field, definition, nodeMap]
   );
 
   const selectValue = useMemo(