diff --git a/server/src/repositories/monitors/IMonitorsRepository.ts b/server/src/repositories/monitors/IMonitorsRepository.ts
index ba28d58e5..06c57ddb9 100644
--- a/server/src/repositories/monitors/IMonitorsRepository.ts
+++ b/server/src/repositories/monitors/IMonitorsRepository.ts
@@ -26,7 +26,7 @@ export interface IMonitorsRepository {
 	findByTeamId(teamId: string, config: TeamQueryConfig): Promise<Monitor[] | null>;
 
 	// update
-	updateById(monitorId: string, updates: Partial<Monitor>): Promise<Monitor>;
+	updateById(monitorId: string, teamId: string, updates: Partial<Monitor>): Promise<Monitor>;
 	togglePauseById(monitorId: string, teamId: string): Promise<Monitor>;
 	// delete
 	deleteById(monitorId: string, teamId: string): Promise<Monitor>;
diff --git a/server/src/repositories/monitors/MongoMonitorsRepository.ts b/server/src/repositories/monitors/MongoMonitorsRepository.ts
index a2aa9de66..fe5958c2a 100644
--- a/server/src/repositories/monitors/MongoMonitorsRepository.ts
+++ b/server/src/repositories/monitors/MongoMonitorsRepository.ts
@@ -96,9 +96,9 @@ class MongoMonitorsRepository implements IMonitorsRepository {
 		return count;
 	};
 
-	updateById = async (monitorId: string, patch: Partial<Monitor>) => {
+	updateById = async (monitorId: string, teamId: string, patch: Partial<Monitor>) => {
 		const updatedMonitor = await MonitorModel.findOneAndUpdate(
-			{ _id: monitorId },
+			{ _id: monitorId, teamId },
 			{
 				$set: {
 					...patch,
diff --git a/server/src/service/business/monitorService.ts b/server/src/service/business/monitorService.ts
index bce6a1283..ff79259eb 100644
--- a/server/src/service/business/monitorService.ts
+++ b/server/src/service/business/monitorService.ts
@@ -14,7 +14,6 @@ type DateRangeKey = "recent" | "day" | "week" | "month" | "all";
 
 export interface IMonitorService {
 	readonly serviceName: string;
-	verifyTeamAccess(args: { teamId: string; monitorId: string }): Promise<void>;
 
 	// create
 	createMonitor(teamId: string, userId: string, body: Monitor): Promise<void>;
@@ -60,7 +59,6 @@ export interface IMonitorService {
 
 	// other
 	sendTestEmail(args: { to: string }): Promise<string>;
-	exportMonitorsToCSV(args: { teamId: string }): Promise<string>;
 	exportMonitorsToJSON(args: { teamId: string }): Promise<any[]>;
 }
 
@@ -146,13 +144,6 @@ export class MonitorService implements IMonitorService {
 		return formatLookup[dateRange];
 	};
 
-	verifyTeamAccess = async ({ teamId, monitorId }: { teamId: string; monitorId: string }): Promise<void> => {
-		const monitor = await this.db.monitorModule.getMonitorById(monitorId);
-		if (!monitor?.teamId?.equals(teamId)) {
-			throw this.errorService.createAuthorizationError();
-		}
-	};
-
 	createMonitor = async (teamId: string, userId: string, body: Monitor): Promise<void> => {
 		const monitor = await this.monitorsRepository.create(body, teamId, userId);
 		if (!monitor) {
@@ -255,8 +246,6 @@ export class MonitorService implements IMonitorService {
 		dateRange: string;
 		normalize?: boolean;
 	}): Promise<any> => {
-		await this.verifyTeamAccess({ teamId, monitorId });
-
 		const monitor = await this.monitorsRepository.findById(monitorId, teamId);
 		if (!monitor) {
 			throw new AppError({ message: `Monitor with ID ${monitorId} not found.`, status: 404 });
@@ -292,7 +281,6 @@ export class MonitorService implements IMonitorService {
 	};
 
 	getHardwareDetailsById = async ({ teamId, monitorId, dateRange }: { teamId: string; monitorId: string; dateRange: string }): Promise<any> => {
-		await this.verifyTeamAccess({ teamId, monitorId });
 		const monitor = await this.monitorsRepository.findById(monitorId, teamId);
 		if (!monitor) {
 			throw new AppError({ message: `Monitor with ID ${monitorId} not found.`, status: 404 });
@@ -324,7 +312,6 @@ export class MonitorService implements IMonitorService {
 	};
 
 	getPageSpeedDetailsById = async ({ teamId, monitorId, dateRange }: { teamId: string; monitorId: string; dateRange: string }): Promise<any> => {
-		await this.verifyTeamAccess({ teamId, monitorId });
 		const monitor = await this.monitorsRepository.findById(monitorId, teamId);
 		if (!monitor) {
 			throw new AppError({ message: `Monitor with ID ${monitorId} not found.`, status: 404 });
@@ -348,7 +335,6 @@ export class MonitorService implements IMonitorService {
 		};
 	};
 	getMonitorById = async ({ teamId, monitorId }: { teamId: string; monitorId: string }): Promise<any> => {
-		await this.verifyTeamAccess({ teamId, monitorId });
 		const monitor = await this.monitorsRepository.findById(monitorId, teamId);
 		return monitor;
 	};
@@ -429,21 +415,18 @@ export class MonitorService implements IMonitorService {
 	};
 
 	editMonitor = async ({ teamId, monitorId, body }: { teamId: string; monitorId: string; body: Monitor }) => {
-		await this.verifyTeamAccess({ teamId, monitorId });
-		const editedMonitor = await this.monitorsRepository.updateById(monitorId, body);
+		const editedMonitor = await this.monitorsRepository.updateById(monitorId, teamId, body);
 		await this.jobQueue.updateJob(editedMonitor);
 		return editedMonitor;
 	};
 
 	pauseMonitor = async ({ teamId, monitorId }: { teamId: string; monitorId: string }): Promise<Monitor> => {
-		await this.verifyTeamAccess({ teamId, monitorId });
 		const monitor = await this.monitorsRepository.togglePauseById(monitorId, teamId);
 		monitor.isActive === true ? await this.jobQueue.resumeJob(monitor) : await this.jobQueue.pauseJob(monitor);
 		return monitor;
 	};
 
 	deleteMonitor = async ({ teamId, monitorId }: { teamId: string; monitorId: string }): Promise<Monitor> => {
-		await this.verifyTeamAccess({ teamId, monitorId });
 		const monitor = await this.monitorsRepository.deleteById(monitorId, teamId);
 		await this.jobQueue.deleteJob(monitor);
 		await this.db.statusPageModule.deleteStatusPagesByMonitorId(monitor.id);
@@ -486,65 +469,13 @@ export class MonitorService implements IMonitorService {
 		return messageId;
 	};
 
-	exportMonitorsToCSV = async ({ teamId }: { teamId: string }): Promise<string> => {
-		const monitors = await this.db.monitorModule.getMonitorsByTeamId({ teamId });
-
-		if (!monitors || monitors.length === 0) {
-			throw this.errorService.createNotFoundError("No monitors to export");
-		}
-
-		const csvData = monitors?.filteredMonitors?.map((monitor: any) => ({
-			name: monitor.name,
-			description: monitor.description,
-			type: monitor.type,
-			url: monitor.url,
-			interval: monitor.interval,
-			port: monitor.port,
-			ignoreTlsErrors: monitor.ignoreTlsErrors,
-			isActive: monitor.isActive,
-		}));
-
-		const csv = this.papaparse.unparse(csvData);
-		return csv;
-	};
 	exportMonitorsToJSON = async ({ teamId }: { teamId: string }): Promise<any[]> => {
-		const monitors = await this.db.monitorModule.getMonitorsByTeamId({ teamId });
+		const monitors = await this.monitorsRepository.findByTeamId(teamId, {});
 
 		if (!monitors || monitors.length === 0) {
 			throw this.errorService.createNotFoundError("No monitors to export");
 		}
 
-		const json = monitors?.filteredMonitors
-			?.map((monitor: any) => {
-				const initialType = monitor.type;
-				let parsedType;
-
-				if (initialType === "hardware") {
-					parsedType = "infrastructure";
-				} else if (initialType === "http") {
-					if (monitor.url.startsWith("https://")) {
-						parsedType = "https";
-					} else {
-						parsedType = "http";
-					}
-				} else if (initialType === "pagespeed") {
-					parsedType = initialType;
-				} else {
-					// Skip unsupported types
-					return;
-				}
-
-				return {
-					name: monitor.name,
-					url: monitor.url,
-					type: parsedType,
-					interval: monitor.interval,
-					n: monitor.statusWindowSize,
-					secret: monitor.secret,
-				};
-			})
-			.filter(Boolean);
-
-		return json;
+		return monitors;
 	};
 }
diff --git a/server/src/service/infrastructure/statusService.js b/server/src/service/infrastructure/statusService.js
index cfbf1b339..0b2e9f44c 100755
--- a/server/src/service/infrastructure/statusService.js
+++ b/server/src/service/infrastructure/statusService.js
@@ -195,7 +195,7 @@ class StatusService {
 
 			// Return early if not enough data points
 			if (monitor.statusWindow.length < monitor.statusWindowSize) {
-				const updated = await this.monitorsRepository.updateById(monitor.id, monitor);
+				const updated = await this.monitorsRepository.updateById(monitor.id, monitor.teamId, monitor);
 				return {
 					monitor: updated,
 					statusChanged: false,
@@ -285,7 +285,7 @@ class StatusService {
 			}
 
 			monitor.status = newStatus;
-			const updated = await this.monitorsRepository.updateById(monitor.id, monitor);
+			const updated = await this.monitorsRepository.updateById(monitor.id, monitor.teamId, monitor);
 
 			return {
 				monitor: updated,