diff --git a/server/src/config/controllers.js b/server/src/config/controllers.js
index 357c33a4b..199068f92 100644
--- a/server/src/config/controllers.js
+++ b/server/src/config/controllers.js
@@ -42,9 +42,7 @@ export const initializeControllers = (services) => {
 	controllers.logController = new LogController(services.logger);
 	controllers.statusPageController = new StatusPageController(services.db);
 	controllers.notificationController = new NotificationController(services.notificationService, services.db);
-	controllers.diagnosticController = new DiagnosticController(commonDependencies, {
-		diagnosticService: services.diagnosticService,
-	});
+	controllers.diagnosticController = new DiagnosticController(services.diagnosticService);
 
 	controllers.incidentController = new IncidentController(services.incidentService);
 
diff --git a/server/src/controllers/v1/diagnosticController.js b/server/src/controllers/v1/diagnosticController.js
deleted file mode 100755
index 0723a9f6c..000000000
--- a/server/src/controllers/v1/diagnosticController.js
+++ /dev/null
@@ -1,61 +0,0 @@
-const SERVICE_NAME = "diagnosticController";
-import BaseController from "./baseController.js";
-/**
- * Diagnostic Controller
- *
- * Handles system diagnostic and monitoring requests including system statistics,
- * performance metrics, and health checks.
- *
- * @class DiagnosticController
- * @description Manages system diagnostics and performance monitoring
- */
-class DiagnosticController extends BaseController {
-	static SERVICE_NAME = SERVICE_NAME;
-	/**
-	 * Creates an instance of DiagnosticController.
-	 * @param {Object} commonDependencies - Common dependencies injected into the controller
-	 * @param {Object} dependencies - The dependencies required by the controller
-	 * @param {Object} dependencies.diagnosticService - Service for system diagnostics and monitoring
-	 */
-	constructor(commonDependencies, { diagnosticService }) {
-		super(commonDependencies);
-		this.diagnosticService = diagnosticService;
-	}
-
-	get serviceName() {
-		return DiagnosticController.SERVICE_NAME;
-	}
-	/**
-	 * Retrieves comprehensive system statistics and performance metrics.
-	 *
-	 * @async
-	 * @function getSystemStats
-	 * @param {Object} req - Express request object
-	 * @param {Object} res - Express response object
-	 * @returns {Promise<Object>} Success response with system diagnostics data
-	 * @description Returns system performance metrics, memory usage, CPU statistics,
-	 * and other diagnostic information useful for monitoring system health.
-	 * @example
-	 * GET /diagnostics/stats
-	 * // Response includes:
-	 * // - Memory usage (heap, external, arrayBuffers)
-	 * // - CPU usage statistics
-	 * // - System uptime
-	 * // - Performance metrics
-	 * // - Database connection status
-	 * // - Active processes/connections
-	 */
-	getSystemStats = this.asyncHandler(
-		async (req, res) => {
-			const diagnostics = await this.diagnosticService.getSystemStats();
-			return res.success({
-				msg: "OK",
-				data: diagnostics,
-			});
-		},
-		SERVICE_NAME,
-		"getSystemStats"
-	);
-}
-
-export default DiagnosticController;
diff --git a/server/src/controllers/v1/diagnosticController.ts b/server/src/controllers/v1/diagnosticController.ts
new file mode 100755
index 000000000..b4d59ceaf
--- /dev/null
+++ b/server/src/controllers/v1/diagnosticController.ts
@@ -0,0 +1,31 @@
+import { Request, Response, NextFunction } from "express";
+
+const SERVICE_NAME = "diagnosticController";
+class DiagnosticController {
+	static SERVICE_NAME = SERVICE_NAME;
+
+	private diagnosticService: any;
+
+	constructor(diagnosticService: any) {
+		this.diagnosticService = diagnosticService;
+	}
+
+	get serviceName() {
+		return DiagnosticController.SERVICE_NAME;
+	}
+
+	getSystemStats = async (req: Request, res: Response, next: NextFunction) => {
+		try {
+			const diagnostics = await this.diagnosticService.getSystemStats();
+			return res.status(200).json({
+				success: true,
+				msg: "OK",
+				data: diagnostics,
+			});
+		} catch (error) {
+			next(error);
+		}
+	};
+}
+
+export default DiagnosticController;