diff --git a/server/src/repositories/checks/IChecksRepository.ts b/server/src/repositories/checks/IChecksRepository.ts
index 74def03c2..b75b18f13 100644
--- a/server/src/repositories/checks/IChecksRepository.ts
+++ b/server/src/repositories/checks/IChecksRepository.ts
@@ -11,6 +11,7 @@ import type { LatestChecksMap } from "@/repositories/checks/MongoChecksRepistory
 
 export interface IChecksRepository {
 	// create
+	create(check: Check): Promise<Check>;
 	createChecks(checks: Check[]): Promise<Check[]>;
 
 	// single fetch
diff --git a/server/src/repositories/checks/MongoChecksRepistory.ts b/server/src/repositories/checks/MongoChecksRepistory.ts
index a36788e2c..c9cdbffd6 100644
--- a/server/src/repositories/checks/MongoChecksRepistory.ts
+++ b/server/src/repositories/checks/MongoChecksRepistory.ts
@@ -227,6 +227,11 @@ class MongoChecksRepository implements IChecksRepository {
 		} as unknown as CheckDocument;
 	};
 
+	create = async (check: Check) => {
+		const savedCheck = await CheckModel.create(check);
+		return this.toEntity(savedCheck);
+	};
+
 	createChecks = async (checks: Check[]) => {
 		const docs = checks.map((check) => this.toDocument(check));
 		const inserted = await CheckModel.insertMany(docs);
diff --git a/server/src/service/infrastructure/statusService.ts b/server/src/service/infrastructure/statusService.ts
index 66b12a315..de8fb9963 100755
--- a/server/src/service/infrastructure/statusService.ts
+++ b/server/src/service/infrastructure/statusService.ts
@@ -52,7 +52,7 @@ export class StatusService implements IStatusService {
 		try {
 			const monitorId = monitor.id;
 			const { responseTime, status } = networkResponse;
-			let stats = await this.monitorStatsRepository.findByMonitorId(monitorId);
+			let stats: Omit<MonitorStats, "id" | "createdAt" | "updatedAt"> = await this.monitorStatsRepository.findByMonitorId(monitorId);
 			if (!stats) {
 				stats = {
 					monitorId,
@@ -62,6 +62,7 @@ export class StatusService implements IStatusService {
 					totalDownChecks: 0,
 					uptimePercentage: 0,
 					lastResponseTime: 0,
+					lastCheckTimestamp: 0,
 				};
 			}
 
@@ -105,8 +106,7 @@ export class StatusService implements IStatusService {
 
 			// latest check
 			stats.lastCheckTimestamp = new Date().getTime();
-
-			await stats.save();
+			await this.monitorStatsRepository.create(stats);
 			return true;
 		} catch (error: any) {
 			this.logger.error({
@@ -121,11 +121,10 @@ export class StatusService implements IStatusService {
 
 	handleIncidentForCheck = async (check: Check, monitor: Monitor, action: any, errorContext = "incident handling") => {
 		try {
-			let savedCheck;
+			let savedCheck: Check | null = null;
 			if (!check.id) {
 				try {
-					const checkModel = new CheckModel(check);
-					savedCheck = await checkModel.save();
+					savedCheck = await this.checksRepository.create(check);
 
 					this.buffer.removeCheckFromBuffer(check);
 				} catch (checkError: any) {