diff --git a/server/src/db/models/Check.ts b/server/src/db/models/Check.ts
index fe6f16836..c176aa3bb 100644
--- a/server/src/db/models/Check.ts
+++ b/server/src/db/models/Check.ts
@@ -288,7 +288,9 @@ const CheckSchema = new Schema<CheckDocument>(
 CheckSchema.index({ updatedAt: 1 });
 CheckSchema.index({ "metadata.monitorId": 1, updatedAt: 1 });
 CheckSchema.index({ "metadata.monitorId": 1, updatedAt: -1 });
+CheckSchema.index({ "metadata.monitorId": 1, createdAt: -1 });
 CheckSchema.index({ "metadata.teamId": 1, updatedAt: -1 });
+CheckSchema.index({ "metadata.teamId": 1, createdAt: -1 });
 
 const CheckModel = model<CheckDocument>("Check", CheckSchema);
 
diff --git a/server/src/repositories/checks/MongoChecksRepistory.ts b/server/src/repositories/checks/MongoChecksRepistory.ts
index f5c398fc8..de26efff4 100644
--- a/server/src/repositories/checks/MongoChecksRepistory.ts
+++ b/server/src/repositories/checks/MongoChecksRepistory.ts
@@ -178,10 +178,15 @@ class MongoChecksRepistory implements IChecksRepository {
 		}
 		const mongoIds = monitorIds.map((id) => new mongoose.Types.ObjectId(id));
 		const limitPerMonitor = 25;
+		const maxIntervalMs = Number(process.env.MONITOR_MAX_INTERVAL_MS ?? 10 * 60 * 1000);
+		const bufferMs = Number(process.env.MONITOR_INTERVAL_BUFFER_MS ?? maxIntervalMs);
+		const lookbackMs = 25 * maxIntervalMs + bufferMs;
+		const cutoffDate = new Date(Date.now() - lookbackMs);
 		const checkGroups = await CheckModel.aggregate([
 			{
 				$match: {
 					"metadata.monitorId": { $in: mongoIds },
+					createdAt: { $gte: cutoffDate },
 				},
 			},
 			{