diff --git a/Client/src/Pages/Uptime/Details/index.jsx b/Client/src/Pages/Uptime/Details/index.jsx
index 33583b0cb..e8311ebb1 100644
--- a/Client/src/Pages/Uptime/Details/index.jsx
+++ b/Client/src/Pages/Uptime/Details/index.jsx
@@ -6,8 +6,9 @@ import ChartBoxes from "./Components/ChartBoxes";
 import ResponseTimeChart from "./Components/Charts/ResponseTimeChart";
 import ResponseTable from "./Components/ResponseTable";
 import UptimeStatusBoxes from "./Components/UptimeStatusBoxes";
+import GenericFallback from "../../../Components/GenericFallback";
 // MUI Components
-import { Stack } from "@mui/material";
+import { Stack, Typography } from "@mui/material";
 
 // Utils
 import { useState } from "react";
@@ -77,6 +78,14 @@ const UptimeDetails = () => {
 		setRowsPerPage(event.target.value);
 	};
 
+	if (!monitorIsLoading && !checksAreLoading && checksCount === 0) {
+		return (
+			<GenericFallback>
+				<Typography>There is no history for this monitor yet.</Typography>
+			</GenericFallback>
+		);
+	}
+
 	return (
 		<Stack gap={theme.spacing(10)}>
 			<Breadcrumbs list={BREADCRUMBS} />