diff --git a/public/pages/QueryDetails/Components/QuerySummary.tsx b/public/pages/QueryDetails/Components/QuerySummary.tsx
index 1e4fd62..564aeb0 100644
--- a/public/pages/QueryDetails/Components/QuerySummary.tsx
+++ b/public/pages/QueryDetails/Components/QuerySummary.tsx
@@ -46,27 +46,15 @@ const QuerySummary = ({ query }: { query: SearchQueryRecord }) => {
         <PanelItem label={TIMESTAMP} value={convertTime(timestamp)} />
         <PanelItem
           label={LATENCY}
-          value={
-            calculateMetric(measurements.latency?.number, measurements.latency?.count) === 'N/A'
-              ? 'N/A'
-              : `${calculateMetric(measurements.latency?.number, measurements.latency?.count)} ms`
-          }
+          value={calculateMetric(measurements.latency?.number, measurements.latency?.count, 'ms')}
         />
         <PanelItem
           label={CPU_TIME}
-          value={
-            calculateMetric(measurements.cpu?.number, measurements.cpu?.count, 1000000) === 'N/A'
-              ? 'N/A'
-              : `${calculateMetric(measurements.cpu?.number, measurements.cpu?.count, 1000000)} ms`
-          }
+          value={calculateMetric(measurements.cpu?.number, measurements.cpu?.count, 'ms', 1000000)}
         />
         <PanelItem
           label={MEMORY_USAGE}
-          value={
-            calculateMetric(measurements.memory?.number, measurements.memory?.count) === 'N/A'
-              ? 'N/A'
-              : `${calculateMetric(measurements.memory?.number, measurements.memory?.count)} B`
-          }
+          value={calculateMetric(measurements.memory?.number, measurements.memory?.count, 'B')}
         />
         <PanelItem label={INDICES} value={indices.toString()} />
         <PanelItem label={SEARCH_TYPE} value={search_type.replaceAll('_', ' ')} />
diff --git a/public/pages/QueryGroupDetails/Components/QueryGroupAggregateSummary.tsx b/public/pages/QueryGroupDetails/Components/QueryGroupAggregateSummary.tsx
index 7047782..689e55d 100644
--- a/public/pages/QueryGroupDetails/Components/QueryGroupAggregateSummary.tsx
+++ b/public/pages/QueryGroupDetails/Components/QueryGroupAggregateSummary.tsx
@@ -40,31 +40,20 @@ export const QueryGroupAggregateSummary = ({ query }: { query: any }) => {
         <PanelItem label={ID} value={id} />
         <PanelItem
           label={AVERAGE_LATENCY}
-          value={
-            calculateMetric(measurements.latency?.number, measurements.latency?.count, 1) === 'N/A'
-              ? 'N/A'
-              : `${calculateMetric(
-                  measurements.latency?.number,
-                  measurements.latency?.count,
-                  1
-                )} ms`
-          }
+          value={calculateMetric(
+            measurements.latency?.number,
+            measurements.latency?.count,
+            'ms',
+            1
+          )}
         />
         <PanelItem
           label={AVERAGE_CPU_TIME}
-          value={
-            calculateMetric(measurements.cpu?.number, measurements.cpu?.count, 1000000) === 'N/A'
-              ? 'N/A'
-              : `${calculateMetric(measurements.cpu?.number, measurements.cpu?.count, 1000000)} ms`
-          }
+          value={calculateMetric(measurements.cpu?.number, measurements.cpu?.count, 'ms', 1000000)}
         />
         <PanelItem
           label={AVERAGE_MEMORY_USAGE}
-          value={
-            calculateMetric(measurements.memory?.number, measurements.memory?.count, 1) === 'N/A'
-              ? 'N/A'
-              : `${calculateMetric(measurements.memory?.number, measurements.memory?.count, 1)} B`
-          }
+          value={calculateMetric(measurements.memory?.number, measurements.memory?.count, 'B', 1)}
         />
         <PanelItem label={GROUP_BY} value={groupBy !== undefined ? `${groupBy}` : 'N/A'} />
       </EuiFlexGrid>
diff --git a/public/pages/QueryInsights/QueryInsights.tsx b/public/pages/QueryInsights/QueryInsights.tsx
index 230ae71..7e038ad 100644
--- a/public/pages/QueryInsights/QueryInsights.tsx
+++ b/public/pages/QueryInsights/QueryInsights.tsx
@@ -12,12 +12,12 @@ import { QUERY_INSIGHTS } from '../TopNQueries/TopNQueries';
 import { SearchQueryRecord } from '../../../types/types';
 import {
   CPU_TIME,
+  ID,
   INDICES,
   LATENCY,
   MEMORY_USAGE,
   NODE_ID,
   QUERY_COUNT,
-  ID,
   SEARCH_TYPE,
   TIMESTAMP,
   TOTAL_SHARDS,
@@ -160,13 +160,13 @@ const QueryInsights = ({
       field: MEASUREMENTS_FIELD,
       name: LATENCY,
       render: (measurements: SearchQueryRecord['measurements']) => {
-        const result = calculateMetric(
+        return calculateMetric(
           measurements?.latency?.number,
           measurements?.latency?.count,
+          'ms',
           1,
           METRIC_DEFAULT_MSG
         );
-        return `${result} ms`;
       },
       sortable: true,
       truncateText: true,
@@ -175,13 +175,13 @@ const QueryInsights = ({
       field: MEASUREMENTS_FIELD,
       name: CPU_TIME,
       render: (measurements: SearchQueryRecord['measurements']) => {
-        const result = calculateMetric(
+        return calculateMetric(
           measurements?.cpu?.number,
           measurements?.cpu?.count,
+          'ms',
           1000000, // Divide by 1,000,000 for CPU time
           METRIC_DEFAULT_MSG
         );
-        return `${result} ms`;
       },
       sortable: true,
       truncateText: true,
@@ -190,13 +190,13 @@ const QueryInsights = ({
       field: MEASUREMENTS_FIELD,
       name: MEMORY_USAGE,
       render: (measurements: SearchQueryRecord['measurements']) => {
-        const result = calculateMetric(
+        return calculateMetric(
           measurements?.memory?.number,
           measurements?.memory?.count,
+          'B',
           1,
           METRIC_DEFAULT_MSG
         );
-        return `${result} B`;
       },
       sortable: true,
       truncateText: true,
diff --git a/public/pages/QueryInsights/__snapshots__/QueryInsights.test.tsx.snap b/public/pages/QueryInsights/__snapshots__/QueryInsights.test.tsx.snap
index 74fde68..a310a4b 100644
--- a/public/pages/QueryInsights/__snapshots__/QueryInsights.test.tsx.snap
+++ b/public/pages/QueryInsights/__snapshots__/QueryInsights.test.tsx.snap
@@ -827,7 +827,7 @@ exports[`QueryInsights Component renders the table with the correct columns and
                 <div
                   class="euiTableCellContent euiTableCellContent--truncateText euiTableCellContent--overflowingContent"
                 >
-                  Not enabled B
+                  Not enabled
                 </div>
               </td>
               <td
diff --git a/public/pages/Utils/MetricUtils.ts b/public/pages/Utils/MetricUtils.ts
index 5b70ff0..b007fcb 100644
--- a/public/pages/Utils/MetricUtils.ts
+++ b/public/pages/Utils/MetricUtils.ts
@@ -6,11 +6,12 @@
 export function calculateMetric(
   value?: number,
   count?: number,
+  unit: string = '',
   factor: number = 1,
   defaultMsg: string = 'N/A'
 ): string {
   if (value !== undefined && count !== undefined) {
-    return (value / count / factor).toFixed(2);
+    return `${(value / count / factor).toFixed(2)} ${unit}`;
   }
   return defaultMsg;
 }