diff --git a/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.ts b/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.ts
index 4b726f046..5b3c085c3 100644
--- a/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.ts
+++ b/ui/src/app/pages/server-routes/server-metrics/server-metrics.page.ts
@@ -43,16 +43,19 @@ export class ServerMetricsPage {
 
   async getMetrics (): Promise<void> {
     try {
-      const metrics = await this.apiService.getServerMetrics({ })
-      Object.keys(metrics).forEach(outerKey => {
-        if (!this.metrics[outerKey]) {
-          this.metrics[outerKey] = metrics[outerKey]
-        } else {
-          Object.entries(metrics[outerKey]).forEach(([key, value]) => {
-            this.metrics[outerKey][key] = value
-          })
-        }
-      })
+      this.metrics = await this.apiService.getServerMetrics({ })
+
+      // @TODO keeping code in case naive approach (above) has issues
+      // Object.keys(metrics).forEach(outerKey => {
+      //   if (!this.metrics[outerKey]) {
+      //     console.log('outer keys')
+      //     this.metrics[outerKey] = metrics[outerKey]
+      //   } else {
+      //     Object.entries(metrics[outerKey]).forEach(([key, value]) => {
+      //       this.metrics[outerKey][key] = value
+      //     })
+      //   }
+      // })
     } catch (e) {
       console.error(e)
       this.error = e.message
diff --git a/ui/src/app/services/api/mock-api.service.ts b/ui/src/app/services/api/mock-api.service.ts
index 41072bb66..0cfb47d7f 100644
--- a/ui/src/app/services/api/mock-api.service.ts
+++ b/ui/src/app/services/api/mock-api.service.ts
@@ -93,7 +93,7 @@ export class MockApiService extends ApiService {
 
   async getServerMetrics (params: RR.GetServerMetricsReq): Promise<RR.GetServerMetricsRes> {
     await pauseFor(2000)
-    return Mock.ServerMetrics
+    return Mock.getServerMetrics()
   }
 
   async updateServerRaw (params: RR.UpdateServerReq): Promise<RR.UpdateServerRes> {
diff --git a/ui/src/app/services/api/mock-app-fixures.ts b/ui/src/app/services/api/mock-app-fixures.ts
index 46a5c3d23..a33706055 100644
--- a/ui/src/app/services/api/mock-app-fixures.ts
+++ b/ui/src/app/services/api/mock-app-fixures.ts
@@ -783,35 +783,79 @@ export module Mock {
     },
   ]
 
-  export const ServerMetrics: RR.GetServerMetricsRes = {
-    'Group1': {
-      'Metric1': {
-        value: 22.2,
-        unit: 'mi/b',
+  export function getServerMetrics () {
+    return {
+      'Group1': {
+        'Metric1': {
+          value: Math.random(),
+          unit: 'mi/b',
+        },
+        'Metric2': {
+          value: Math.random(),
+          unit: '%',
+        },
+        'Metric3': {
+          value: 10.1,
+          unit: '%',
+        },
       },
-      'Metric2': {
-        value: 50,
-        unit: '%',
+      'Group2': {
+        'Hmmmm1': {
+          value: 22.2,
+          unit: 'mi/b',
+        },
+        'Hmmmm2': {
+          value: 50,
+          unit: '%',
+        },
+        'Hmmmm3': {
+          value: 10.1,
+          unit: '%',
+        },
       },
-      'Metric3': {
-        value: 10.1,
-        unit: '%',
+      'Group3': {
+        'Hmmmm1': {
+          value: Math.random(),
+          unit: 'mi/b',
+        },
+        'Hmmmm2': {
+          value: 50,
+          unit: '%',
+        },
+        'Hmmmm3': {
+          value: 10.1,
+          unit: '%',
+        },
       },
-    },
-    'Group2': {
-      'Hmmmm1': {
-        value: 22.2,
-        unit: 'mi/b',
+      'Group4': {
+        'Hmmmm1': {
+          value: Math.random(),
+          unit: 'mi/b',
+        },
+        'Hmmmm2': {
+          value: 50,
+          unit: '%',
+        },
+        'Hmmmm3': {
+          value: 10.1,
+          unit: '%',
+        },
       },
-      'Hmmmm2': {
-        value: 50,
-        unit: '%',
+      'Group5': {
+        'Hmmmm1': {
+          value: Math.random(),
+          unit: 'mi/b',
+        },
+        'Hmmmm2': {
+          value: 50,
+          unit: '%',
+        },
+        'Hmmmm3': {
+          value: 10.1,
+          unit: '%',
+        },
       },
-      'Hmmmm3': {
-        value: 10.1,
-        unit: '%',
-      },
-    },
+    }
   }
 
   export const ServerLogs: RR.GetServerLogsRes = [