diff --git a/Client/src/Pages/Uptime/Details/Components/ChartBoxes/index.jsx b/Client/src/Pages/Uptime/Details/Components/ChartBoxes/index.jsx
index 5565529fb..aa40442a9 100644
--- a/Client/src/Pages/Uptime/Details/Components/ChartBoxes/index.jsx
+++ b/Client/src/Pages/Uptime/Details/Components/ChartBoxes/index.jsx
@@ -123,7 +123,7 @@ const ChartBoxes = ({
 				icon={<AverageResponseIcon />}
 				header="Average Response Time"
 			>
-				<ResponseGaugeChart avgResponseTime={monitor.avgResponseTime ?? 0} />
+				<ResponseGaugeChart avgResponseTime={monitor?.avgResponseTime ?? 0} />
 			</ChartBox>
 		</Stack>
 	);
@@ -133,7 +133,7 @@ export default ChartBoxes;
 
 ChartBoxes.propTypes = {
 	shouldRender: PropTypes.bool,
-	monitor: PropTypes.object.isRequired,
+	monitor: PropTypes.object,
 	dateRange: PropTypes.string.isRequired,
 	uiTimezone: PropTypes.string.isRequired,
 	dateFormat: PropTypes.string.isRequired,
diff --git a/Client/src/Pages/Uptime/Details/Components/Charts/DownBarChart.jsx b/Client/src/Pages/Uptime/Details/Components/Charts/DownBarChart.jsx
index dcd3a06be..5d6c48b58 100644
--- a/Client/src/Pages/Uptime/Details/Components/Charts/DownBarChart.jsx
+++ b/Client/src/Pages/Uptime/Details/Components/Charts/DownBarChart.jsx
@@ -19,7 +19,7 @@ const DownBarChart = memo(({ monitor, type, onBarHover }) => {
 			<BarChart
 				width="100%"
 				height="100%"
-				data={monitor.groupedDownChecks}
+				data={monitor?.groupedDownChecks}
 				onMouseEnter={() => {
 					setChartHovered(true);
 					onBarHover({ time: null, totalChecks: 0 });
diff --git a/Client/src/Pages/Uptime/Details/Components/Charts/ResponseTimeChart.jsx b/Client/src/Pages/Uptime/Details/Components/Charts/ResponseTimeChart.jsx
index 8be1125c2..c262d4cce 100644
--- a/Client/src/Pages/Uptime/Details/Components/Charts/ResponseTimeChart.jsx
+++ b/Client/src/Pages/Uptime/Details/Components/Charts/ResponseTimeChart.jsx
@@ -15,7 +15,7 @@ const ResponseTImeChart = ({ shouldRender = true, monitor, dateRange }) => {
 			header="Response Times"
 		>
 			<MonitorDetailsAreaChart
-				checks={monitor.groupedChecks ?? []}
+				checks={monitor?.groupedChecks ?? []}
 				dateRange={dateRange}
 			/>
 		</ChartBox>
diff --git a/Client/src/Pages/Uptime/Details/Components/ResponseTable/index.jsx b/Client/src/Pages/Uptime/Details/Components/ResponseTable/index.jsx
index 1f5a19203..c03115af7 100644
--- a/Client/src/Pages/Uptime/Details/Components/ResponseTable/index.jsx
+++ b/Client/src/Pages/Uptime/Details/Components/ResponseTable/index.jsx
@@ -8,7 +8,7 @@ import { formatDateWithTz } from "../../../../../Utils/timeUtils";
 import SkeletonLayout from "./skeleton";
 const ResponseTable = ({
 	shouldRender = true,
-	checks,
+	checks = [],
 	checksCount,
 	uiTimezone,
 	page,
@@ -77,8 +77,8 @@ const ResponseTable = ({
 
 ResponseTable.propTypes = {
 	shouldRender: PropTypes.bool,
-	checks: PropTypes.array.isRequired,
-	checksCount: PropTypes.number.isRequired,
+	checks: PropTypes.array,
+	checksCount: PropTypes.number,
 	uiTimezone: PropTypes.string.isRequired,
 	page: PropTypes.number.isRequired,
 	setPage: PropTypes.func.isRequired,
diff --git a/Client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx b/Client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx
index ad4620396..5597ce2ac 100644
--- a/Client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx
+++ b/Client/src/Pages/Uptime/Details/Components/UptimeStatusBoxes/index.jsx
@@ -8,6 +8,7 @@ import useUtils from "../../../Monitors/Hooks/useUtils";
 const UptimeStatusBoxes = ({ shouldRender, monitor, certificateExpiry }) => {
 	const theme = useTheme();
 	const { determineState } = useUtils();
+
 	const { time: streakTime, units: streakUnits } = getHumanReadableDuration(
 		monitor?.uptimeStreak
 	);