diff --git a/public/app/plugins/datasource/testdata/nodeGraphUtils.ts b/public/app/plugins/datasource/testdata/nodeGraphUtils.ts
index 8e65b2ae0a0..cb1c50a3e15 100644
--- a/public/app/plugins/datasource/testdata/nodeGraphUtils.ts
+++ b/public/app/plugins/datasource/testdata/nodeGraphUtils.ts
@@ -1,4 +1,11 @@
-import { ArrayVector, FieldType, MutableDataFrame, NodeGraphDataFrameFieldNames } from '@grafana/data';
+import {
+  ArrayVector,
+  FieldColorModeId,
+  FieldDTO,
+  FieldType,
+  MutableDataFrame,
+  NodeGraphDataFrameFieldNames,
+} from '@grafana/data';
 import { nodes, edges } from './testData/serviceMapResponse';
 
 export function generateRandomNodes(count = 10) {
@@ -43,7 +50,7 @@ export function generateRandomNodes(count = 10) {
     nodes[sourceIndex].edges.push(nodes[sourceIndex].id);
   }
 
-  const nodeFields: any = {
+  const nodeFields: Record<string, Omit<FieldDTO, 'name'> & { values: ArrayVector }> = {
     [NodeGraphDataFrameFieldNames.id]: {
       values: new ArrayVector(),
       type: FieldType.string,
@@ -59,20 +66,22 @@ export function generateRandomNodes(count = 10) {
     [NodeGraphDataFrameFieldNames.mainStat]: {
       values: new ArrayVector(),
       type: FieldType.number,
+      config: { displayName: 'Transactions per second' },
     },
     [NodeGraphDataFrameFieldNames.secondaryStat]: {
       values: new ArrayVector(),
       type: FieldType.number,
+      config: { displayName: 'Average duration' },
     },
     [NodeGraphDataFrameFieldNames.arc + 'success']: {
       values: new ArrayVector(),
       type: FieldType.number,
-      config: { color: { fixedColor: 'green' } },
+      config: { color: { fixedColor: 'green', mode: FieldColorModeId.Fixed }, displayName: 'Success' },
     },
     [NodeGraphDataFrameFieldNames.arc + 'errors']: {
       values: new ArrayVector(),
       type: FieldType.number,
-      config: { color: { fixedColor: 'red' } },
+      config: { color: { fixedColor: 'red', mode: FieldColorModeId.Fixed }, displayName: 'Errors' },
     },
   };
 
diff --git a/public/app/plugins/panel/nodeGraph/layout.ts b/public/app/plugins/panel/nodeGraph/layout.ts
index 349feabcd0b..d1b1ca9b8b8 100644
--- a/public/app/plugins/panel/nodeGraph/layout.ts
+++ b/public/app/plugins/panel/nodeGraph/layout.ts
@@ -137,16 +137,21 @@ function defaultLayout(
     for (let i = 0; i < nodes.length; i++) {
       // These stats needs to be Field class but the data is stringified over the worker boundary
       event.data.nodes[i] = {
+        ...nodes[i],
         ...event.data.nodes[i],
-        mainStat: nodes[i].mainStat,
-        secondaryStat: nodes[i].secondaryStat,
-        arcSections: nodes[i].arcSections,
       };
     }
     done(event.data);
   };
 
-  worker.postMessage({ nodes, edges, config: defaultConfig });
+  worker.postMessage({
+    nodes: nodes.map((n) => ({
+      id: n.id,
+      incoming: n.incoming,
+    })),
+    edges,
+    config: defaultConfig,
+  });
 }
 
 /**