diff --git a/client/src/Components/v2/common/controls/HeaderMonitorControls.tsx b/client/src/Components/v2/common/controls/HeaderMonitorControls.tsx
index fb9161425..17576a8b2 100644
--- a/client/src/Components/v2/common/controls/HeaderMonitorControls.tsx
+++ b/client/src/Components/v2/common/controls/HeaderMonitorControls.tsx
@@ -66,7 +66,7 @@ export const HeaderMonitorControls = ({
 					variant="contained"
 					color="secondary"
 					startIcon={<Icon icon={Bug} />}
-					onClick={(e) => {
+					onClick={() => {
 						navigate(`/incidents/${monitor?.id}`);
 					}}
 				>
diff --git a/client/src/Components/v2/common/controls/HeaderTimeRange.tsx b/client/src/Components/v2/common/controls/HeaderTimeRange.tsx
index 772683b43..57b61473a 100644
--- a/client/src/Components/v2/common/controls/HeaderTimeRange.tsx
+++ b/client/src/Components/v2/common/controls/HeaderTimeRange.tsx
@@ -37,10 +37,30 @@ export const HeaderTimeRange = ({
 				onChange={handleChange}
 				size="small"
 			>
-				<ToggleButton value="recent">Recent</ToggleButton>
-				<ToggleButton value="day">Day</ToggleButton>
-				<ToggleButton value="week">Week</ToggleButton>
-				<ToggleButton value="month">Month</ToggleButton>
+				<ToggleButton
+					disabled={isLoading}
+					value="recent"
+				>
+					Recent
+				</ToggleButton>
+				<ToggleButton
+					disabled={isLoading}
+					value="day"
+				>
+					Day
+				</ToggleButton>
+				<ToggleButton
+					disabled={isLoading}
+					value="week"
+				>
+					Week
+				</ToggleButton>
+				<ToggleButton
+					disabled={isLoading}
+					value="month"
+				>
+					Month
+				</ToggleButton>
 			</ToggleButtonGroup>
 		);
 	}
diff --git a/client/src/Components/v2/monitors/charts/HistogramStatus.tsx b/client/src/Components/v2/monitors/charts/HistogramStatus.tsx
index 432f1a591..1c25c339e 100644
--- a/client/src/Components/v2/monitors/charts/HistogramStatus.tsx
+++ b/client/src/Components/v2/monitors/charts/HistogramStatus.tsx
@@ -8,7 +8,6 @@ import { useTranslation } from "react-i18next";
 import { ResponsiveContainer, BarChart, XAxis, Bar, Cell, Tooltip } from "recharts";
 import { getResponseTimeColor } from "@/Utils/MonitorUtils";
 import type { GroupedCheck } from "@/Types/Check";
-import type { MonitorData } from "@/Types/Monitor";
 import type { RootState } from "@/Types/state";
 
 interface XLabelProps {
@@ -50,7 +49,6 @@ const XLabel = ({ p1, p2, range }: XLabelProps) => {
 interface HistogramStatusProps {
 	title: string;
 	icon: React.ReactNode;
-	monitorData?: MonitorData;
 	checks?: GroupedCheck[];
 	range: string;
 }
@@ -58,7 +56,6 @@ interface HistogramStatusProps {
 export const HistogramStatus = ({
 	title,
 	icon,
-	monitorData,
 	checks = [],
 	range,
 }: HistogramStatusProps) => {
diff --git a/client/src/Pages/Uptime/Details/index.tsx b/client/src/Pages/Uptime/Details/index.tsx
index a148e38fa..1a6177ddc 100644
--- a/client/src/Pages/Uptime/Details/index.tsx
+++ b/client/src/Pages/Uptime/Details/index.tsx
@@ -51,7 +51,6 @@ const UptimeDetailsPage = () => {
 	const {
 		data: monitorDetailsData,
 		isLoading: monitorIsLoading,
-		error: monitorError,
 		refetch: refetchMonitor,
 	} = useGet<MonitorDetailsResponse>(
 		monitorDetailsUrl,
@@ -99,11 +98,11 @@ const UptimeDetailsPage = () => {
 		return `/checks/${monitorId}?${params.toString()}`;
 	}, [monitorId, monitor?.type, dateRange, page, rowsPerPage]);
 
-	const {
-		data: checksData,
-		isLoading: checksIsLoading,
-		error: checksError,
-	} = useGet<ChecksResponse>(checksUrl, {}, { keepPreviousData: true });
+	const { data: checksData, isLoading: checksIsLoading } = useGet<ChecksResponse>(
+		checksUrl,
+		{},
+		{ keepPreviousData: true }
+	);
 
 	const checks = checksData?.checks ?? [];
 	const checksCount = checksData?.checksCount ?? 0;
@@ -134,15 +133,13 @@ const UptimeDetailsPage = () => {
 				<HistogramStatus
 					title={t("common.charts.labels.uptime")}
 					icon={<TrendingUp />}
-					monitorData={monitorData}
-					checks={monitorData?.groupedUpChecks}
+					checks={monitorData?.groupedUpChecks ?? []}
 					range={dateRange}
 				/>
 				<HistogramStatus
 					title={t("common.charts.labels.downtime")}
 					icon={<AlertTriangle />}
-					monitorData={monitorData}
-					checks={monitorData?.groupedDownChecks}
+					checks={monitorData?.groupedDownChecks ?? []}
 					range={dateRange}
 				/>
 				<RadialAvgResponse