diff --git a/Server/db/mongo/modules/checkModule.js b/Server/db/mongo/modules/checkModule.js
index 3d158a812..6450b78a2 100644
--- a/Server/db/mongo/modules/checkModule.js
+++ b/Server/db/mongo/modules/checkModule.js
@@ -123,8 +123,12 @@ const getChecksByMonitor = async (req) => {
 			},
 			{
 				$project: {
-					checksCount: { $arrayElemAt: ["$summary.checksCount", 0] },
-					checks: "$checks",
+					checksCount: {
+						$ifNull: [{ $arrayElemAt: ["$summary.checksCount", 0] }, 0],
+					},
+					checks: {
+						$ifNull: ["$checks", []],
+					},
 				},
 			},
 		]);
diff --git a/Server/db/mongo/modules/monitorModule.js b/Server/db/mongo/modules/monitorModule.js
index 9ff80e7bf..af4ea7e9f 100644
--- a/Server/db/mongo/modules/monitorModule.js
+++ b/Server/db/mongo/modules/monitorModule.js
@@ -340,6 +340,7 @@ const getUptimeDetailsById = async (req) => {
 		};
 
 		const dateString = formatLookup[dateRange];
+
 		const results = await Check.aggregate(
 			buildUptimeDetailsPipeline(monitor, dates, dateString)
 		);
diff --git a/Server/db/mongo/modules/monitorModuleQueries.js b/Server/db/mongo/modules/monitorModuleQueries.js
index cdbcd51d8..094e1f932 100644
--- a/Server/db/mongo/modules/monitorModuleQueries.js
+++ b/Server/db/mongo/modules/monitorModuleQueries.js
@@ -218,18 +218,20 @@ const buildUptimeDetailsPipeline = (monitor, dates, dateString) => {
 		{
 			$project: {
 				uptimeStreak: {
-					$cond: [
-						{ $eq: [{ $size: { $first: "$uptimeStreak.streak.checks" } }, 0] },
-						0,
-						{
-							$subtract: [
-								new Date(),
+					$let: {
+						vars: {
+							checks: { $ifNull: [{ $first: "$uptimeStreak.streak.checks" }, []] },
+						},
+						in: {
+							$cond: [
+								{ $eq: [{ $size: "$$checks" }, 0] },
+								0,
 								{
-									$last: { $first: "$uptimeStreak.streak.checks.createdAt" },
+									$subtract: [new Date(), { $last: "$$checks.createdAt" }],
 								},
 							],
 						},
-					],
+					},
 				},
 				avgResponseTime: {
 					$arrayElemAt: ["$aggregateData.avgResponseTime", 0],