diff --git a/frontend/src/components/Service/AdvancedChart.vue b/frontend/src/components/Service/AdvancedChart.vue
index 650ef519..f7448969 100644
--- a/frontend/src/components/Service/AdvancedChart.vue
+++ b/frontend/src/components/Service/AdvancedChart.vue
@@ -130,12 +130,8 @@
                 let ts = w.globals.seriesX[seriesIndex][dataPointIndex];
                 const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
                 let val = series[seriesIndex][dataPointIndex];
-                if (val >= 10000) {
-                  val = Math.round(val / 1000) + " ms"
-                } else {
-                  val = val + " μs"
-                }
-                return `<div class="chartmarker"><span>Response Time: </span><span class="font-3">${val}</span><span>${dt}</span></div>`
+                let humanVal = this.humanTime(val);
+                return `<div class="chartmarker"><span>Response Time: </span><span class="font-3">${humanVal}</span><span>${dt}</span></div>`
               },
               fixed: {
                 enabled: true,
diff --git a/frontend/src/components/Service/ServiceChart.vue b/frontend/src/components/Service/ServiceChart.vue
index 1e0cfba8..3d6b2ddb 100644
--- a/frontend/src/components/Service/ServiceChart.vue
+++ b/frontend/src/components/Service/ServiceChart.vue
@@ -114,11 +114,7 @@
                           const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
                           let val = series[seriesIndex][dataPointIndex];
                           let humanVal = this.humanTime(val);
-                          return `<div class="chartmarker">
-                                        <span>Average Response Time: </span>
-                                        <span class="font-3">${humanVal}</span>
-                                        <span>${dt}</span>
-                                    </div>`
+                          return `<div class="chartmarker"><span>Average Response Time: </span><span class="font-3">${humanVal}</span><span>${dt}</span></div>`
                       },
                       fixed: {
                           enabled: true,
diff --git a/frontend/src/components/Service/ServiceSparkLine.vue b/frontend/src/components/Service/ServiceSparkLine.vue
index 5141f578..af3a1e02 100644
--- a/frontend/src/components/Service/ServiceSparkLine.vue
+++ b/frontend/src/components/Service/ServiceSparkLine.vue
@@ -55,12 +55,8 @@
             let ts = w.globals.seriesX[seriesIndex][dataPointIndex];
             const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
             let val = series[seriesIndex][dataPointIndex];
-            if (val >= 10000) {
-              val = Math.round(val / 1000) + " ms"
-            } else {
-              val = val + " μs"
-            }
-            return `<div class="chartmarker"><span>Average Response Time: </span><span class="font-3">${val}</span><span>${dt}</span></div>`
+            let humanVal = this.humanTime(val);
+            return `<div class="chartmarker"><span>Average Response Time: </span><span class="font-3">${humanVal}</span><span>${dt}</span></div>`
           },
           fixed: {
             enabled: true,
diff --git a/frontend/src/pages/Service.vue b/frontend/src/pages/Service.vue
index 8e2d93ff..5a0d18bc 100644
--- a/frontend/src/pages/Service.vue
+++ b/frontend/src/pages/Service.vue
@@ -269,12 +269,8 @@ export default {
                         let ts = w.globals.seriesX[seriesIndex][dataPointIndex];
                         const dt = new Date(ts).toLocaleDateString("en-us", timeoptions)
                         let val = series[seriesIndex][dataPointIndex];
-                        if (val >= 10000) {
-                            val = Math.round(val / 1000) + " ms"
-                        } else {
-                            val = val + " μs"
-                        }
-                        return `<div class="chartmarker"><span>Response Time: </span><span class="font-3">${val}</span><span>${dt}</span></div>`
+                        let humanVal = this.humanTime(val);
+                        return `<div class="chartmarker"><span>Response Time: </span><span class="font-3">${humanVal}</span><span>${dt}</span></div>`
                     },
                     fixed: {
                         enabled: true,