diff --git a/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js b/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js
index 9ab7d385b..dc9fa3c20 100644
--- a/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js
+++ b/Client/src/Features/UptimeMonitors/uptimeMonitorsSlice.js
@@ -33,9 +33,9 @@ export const getUptimeMonitorsByUserId = createAsyncThunk(
   async (token, thunkApi) => {
     const user = jwtDecode(token);
     try {
-      const res = await networkService.getMonitorsByUserId(
+      const res = await networkService.getMonitorsByTeamId(
         token,
-        user._id,
+        user.teamId,
         25,
         ["http", "ping"],
         null,
diff --git a/Client/src/Utils/NetworkService.js b/Client/src/Utils/NetworkService.js
index cd46469b4..1901f6654 100644
--- a/Client/src/Utils/NetworkService.js
+++ b/Client/src/Utils/NetworkService.js
@@ -52,9 +52,9 @@ class NetworkService {
    * @param {boolean} [normalize] - Whether to normalize the retrieved monitors.
    * @returns {Promise<AxiosResponse>} The response from the axios GET request.
    */
-  async getMonitorsByUserId(
+  async getMonitorsByTeamId(
     authToken,
-    userId,
+    teamId,
     limit,
     types,
     status,
@@ -74,7 +74,7 @@ class NetworkService {
     if (normalize) params.append("normalize", normalize);
 
     return this.axiosInstance.get(
-      `/monitors/user/${userId}?${params.toString()}`,
+      `/monitors/team/${teamId}?${params.toString()}`,
       {
         headers: {
           Authorization: `Bearer ${authToken}`,
diff --git a/Server/controllers/monitorController.js b/Server/controllers/monitorController.js
index 37aff6c96..c3fe37955 100644
--- a/Server/controllers/monitorController.js
+++ b/Server/controllers/monitorController.js
@@ -1,10 +1,10 @@
 const {
   getMonitorByIdParamValidation,
   getMonitorByIdQueryValidation,
-  getMonitorsByUserIdValidation,
+  getMonitorsByTeamIdValidation,
   createMonitorBodyValidation,
   editMonitorBodyValidation,
-  getMonitorsByUserIdQueryValidation,
+  getMonitorsByTeamIdQueryValidation,
 } = require("../validation/joi");
 
 const sslChecker = require("ssl-checker");
@@ -149,10 +149,10 @@ const getMonitorById = async (req, res, next) => {
  * @returns {Promise<Express.Response>}
  * @throws {Error}
  */
-const getMonitorsByUserId = async (req, res, next) => {
+const getMonitorsByTeamId = async (req, res, next) => {
   try {
-    await getMonitorsByUserIdValidation.validateAsync(req.params);
-    await getMonitorsByUserIdQueryValidation.validateAsync(req.query);
+    await getMonitorsByTeamIdValidation.validateAsync(req.params);
+    await getMonitorsByTeamIdQueryValidation.validateAsync(req.query);
   } catch (error) {
     error.status = 422;
     error.service = SERVICE_NAME;
@@ -163,12 +163,12 @@ const getMonitorsByUserId = async (req, res, next) => {
   }
 
   try {
-    const userId = req.params.userId;
-    const monitors = await req.db.getMonitorsByUserId(req, res);
+    const teamId = req.params.teamId;
+    const monitors = await req.db.getMonitorsByTeamId(req, res);
 
     return res.json({
       success: true,
-      msg: successMessages.MONITOR_GET_BY_USER_ID(userId),
+      msg: successMessages.MONITOR_GET_BY_USER_ID(teamId),
       data: monitors,
     });
   } catch (error) {
@@ -342,7 +342,7 @@ module.exports = {
   getMonitorStatsById,
   getMonitorCertificate,
   getMonitorById,
-  getMonitorsByUserId,
+  getMonitorsByTeamId,
   createMonitor,
   deleteMonitor,
   deleteAllMonitors,
diff --git a/Server/db/mongo/MongoDB.js b/Server/db/mongo/MongoDB.js
index d6440ca12..05dfa35c5 100644
--- a/Server/db/mongo/MongoDB.js
+++ b/Server/db/mongo/MongoDB.js
@@ -66,7 +66,7 @@ const {
   getAllMonitors,
   getMonitorStatsById,
   getMonitorById,
-  getMonitorsByUserId,
+  getMonitorsByTeamId,
   createMonitor,
   deleteMonitor,
   deleteAllMonitors,
@@ -145,7 +145,7 @@ module.exports = {
   getAllMonitors,
   getMonitorStatsById,
   getMonitorById,
-  getMonitorsByUserId,
+  getMonitorsByTeamId,
   createMonitor,
   deleteMonitor,
   deleteAllMonitors,
diff --git a/Server/db/mongo/modules/monitorModule.js b/Server/db/mongo/modules/monitorModule.js
index 612b71a89..6e3bba66c 100644
--- a/Server/db/mongo/modules/monitorModule.js
+++ b/Server/db/mongo/modules/monitorModule.js
@@ -287,17 +287,17 @@ const getMonitorById = async (monitorId) => {
 };
 
 /**
- * Get monitors by UserID
+ * Get monitors by TeamID
  * @async
  * @param {Express.Request} req
  * @param {Express.Response} res
  * @returns {Promise<Array<Monitor>>}
  * @throws {Error}
  */
-const getMonitorsByUserId = async (req, res) => {
+const getMonitorsByTeamId = async (req, res) => {
   try {
     let { limit, type, status, sortOrder, normalize } = req.query || {};
-    const monitorQuery = { userId: req.params.userId };
+    const monitorQuery = { teamId: req.params.teamId };
 
     if (type !== undefined) {
       const types = Array.isArray(type) ? type : [type];
@@ -453,7 +453,7 @@ module.exports = {
   getAllMonitors,
   getMonitorStatsById,
   getMonitorById,
-  getMonitorsByUserId,
+  getMonitorsByTeamId,
   createMonitor,
   deleteMonitor,
   deleteAllMonitors,
diff --git a/Server/routes/monitorRoute.js b/Server/routes/monitorRoute.js
index 847b2b25d..facbf47ed 100644
--- a/Server/routes/monitorRoute.js
+++ b/Server/routes/monitorRoute.js
@@ -7,7 +7,7 @@ router.get("/", monitorController.getAllMonitors);
 router.get("/stats/:monitorId", monitorController.getMonitorStatsById);
 router.get("/certificate/:monitorId", monitorController.getMonitorCertificate);
 router.get("/:monitorId", monitorController.getMonitorById);
-router.get("/user/:userId", monitorController.getMonitorsByUserId);
+router.get("/team/:teamId", monitorController.getMonitorsByTeamId);
 
 router.post("/", monitorController.createMonitor);
 router.delete(
diff --git a/Server/validation/joi.js b/Server/validation/joi.js
index 24e7f7b76..a97574548 100644
--- a/Server/validation/joi.js
+++ b/Server/validation/joi.js
@@ -160,11 +160,11 @@ const getMonitorByIdQueryValidation = joi.object({
   normalize: joi.boolean(),
 });
 
-const getMonitorsByUserIdValidation = joi.object({
-  userId: joi.string().required(),
+const getMonitorsByTeamIdValidation = joi.object({
+  teamId: joi.string().required(),
 });
 
-const getMonitorsByUserIdQueryValidation = joi.object({
+const getMonitorsByTeamIdQueryValidation = joi.object({
   status: joi.boolean(),
   sortOrder: joi.string().valid("asc", "desc"),
   limit: joi.number(),
@@ -347,8 +347,8 @@ module.exports = {
   createMonitorBodyValidation,
   getMonitorByIdParamValidation,
   getMonitorByIdQueryValidation,
-  getMonitorsByUserIdValidation,
-  getMonitorsByUserIdQueryValidation,
+  getMonitorsByTeamIdValidation,
+  getMonitorsByTeamIdQueryValidation,
   editMonitorBodyValidation,
   editUserParamValidation,
   editUserBodyValidation,