diff --git a/dashboard/src/components/SystemMetrics.vue b/dashboard/src/components/SystemMetrics.vue
index f616ef7fd..181fce247 100644
--- a/dashboard/src/components/SystemMetrics.vue
+++ b/dashboard/src/components/SystemMetrics.vue
@@ -71,15 +71,15 @@ async function onPeriodChange() {
   const [error, metrics] = await systemModel.getMetrics({ fromSecs: period.value.hours * 60 * 60, intervalSecs: period.value.intervalSecs });
   if (error) return console.error(error);
 
-  cpuGraphItem.value.setData(metrics.cpu);
-  memoryGraphItem.value.setData(metrics.memory, metrics.swap);
-  diskGraphItem.value.setData(metrics.blockReadRate, metrics.blockWriteRate);
-  networkGraphItem.value.setData(metrics.networkReadRate, metrics.networkWriteRate);
+  cpuGraphItem.value.setData(metrics.system.cpu);
+  memoryGraphItem.value.setData(metrics.system.memory, metrics.system.swap);
+  diskGraphItem.value.setData(metrics.system.blockReadRate, metrics.system.blockWriteRate);
+  networkGraphItem.value.setData(metrics.system.networkReadRate, metrics.system.networkWriteRate);
 
-  networkReadTotal.value = prettyDecimalSize(metrics.networkReadTotal);
-  networkWriteTotal.value = prettyDecimalSize(metrics.networkWriteTotal);
-  blockReadTotal.value = prettyDecimalSize(metrics.blockReadTotal);
-  blockWriteTotal.value = prettyDecimalSize(metrics.blockWriteTotal);
+  networkReadTotal.value = prettyDecimalSize(metrics.system.networkReadTotal);
+  networkWriteTotal.value = prettyDecimalSize(metrics.system.networkWriteTotal);
+  blockReadTotal.value = prettyDecimalSize(metrics.system.blockReadTotal);
+  blockWriteTotal.value = prettyDecimalSize(metrics.system.blockWriteTotal);
 }
 
 onMounted(async () => {
diff --git a/src/metrics.js b/src/metrics.js
index 6d71d6329..5531973e9 100644
--- a/src/metrics.js
+++ b/src/metrics.js
@@ -377,7 +377,7 @@ async function getSystem(options) {
     }
 
     return {
-        ...systemStats, // { cpu, memory, swap, block{Read,Write}{Rate,Total}, network{Read,Write}{Rate,Total}
+        system: systemStats, // { cpu, memory, swap, block{Read,Write}{Rate,Total}, network{Read,Write}{Rate,Total}
         apps: appStats,
         services: serviceStats,
     };