diff --git a/Client/src/Components/Charts/ChartUtils.js b/Client/src/Components/Charts/ChartUtils.js
index a484622ec..77d9d4c2d 100644
--- a/Client/src/Components/Charts/ChartUtils.js
+++ b/Client/src/Components/Charts/ChartUtils.js
@@ -39,6 +39,8 @@ export const NormalizeData = (checks, rangeMin, rangeMax) => {
 
     return normalizedChecks;
   } else {
-    return checks;
+    return checks.map((check) => {
+      return { ...check, originalResponseTime: check.responseTime };
+    });
   }
 };
diff --git a/Client/src/Pages/Monitors/Details/index.jsx b/Client/src/Pages/Monitors/Details/index.jsx
index 74177b583..7d565d372 100644
--- a/Client/src/Pages/Monitors/Details/index.jsx
+++ b/Client/src/Pages/Monitors/Details/index.jsx
@@ -124,6 +124,9 @@ const DetailsPage = () => {
         break;
       }
     }
+    if (latestDownCheck === 0) {
+      return Date.now() - new Date(checks[checks.length - 1].createdAt);
+    }
     return latestCheck - latestDownCheck;
   };