diff --git a/Client/src/Pages/Monitors/CreateMonitor/index.jsx b/Client/src/Pages/Monitors/CreateMonitor/index.jsx
index 28493080a..21233a264 100644
--- a/Client/src/Pages/Monitors/CreateMonitor/index.jsx
+++ b/Client/src/Pages/Monitors/CreateMonitor/index.jsx
@@ -118,9 +118,11 @@ const CreateMonitor = () => {
       form = {
         ...form,
         description: form.name,
+        teamId: user.teamId,
         userId: user._id,
         notifications: monitor.notifications,
       };
+      console.log(form);
       const action = await dispatch(
         createUptimeMonitor({ authToken, monitor: form })
       );
diff --git a/Server/db/mongo/modules/monitorModule.js b/Server/db/mongo/modules/monitorModule.js
index 9778b6224..612b71a89 100644
--- a/Server/db/mongo/modules/monitorModule.js
+++ b/Server/db/mongo/modules/monitorModule.js
@@ -364,10 +364,10 @@ const getMonitorsByUserId = async (req, res) => {
  */
 const createMonitor = async (req, res) => {
   try {
+    console.log(req.body);
     const monitor = new Monitor({ ...req.body });
     // Remove notifications fom monitor as they aren't needed here
     monitor.notifications = undefined;
-    monitor.userId = req.user._id;
     await monitor.save();
     return monitor;
   } catch (error) {
diff --git a/Server/validation/joi.js b/Server/validation/joi.js
index a9bcb9683..24e7f7b76 100644
--- a/Server/validation/joi.js
+++ b/Server/validation/joi.js
@@ -180,6 +180,7 @@ const getMonitorsByUserIdQueryValidation = joi.object({
 const createMonitorBodyValidation = joi.object({
   _id: joi.string(),
   userId: joi.string().required(),
+  teamId: joi.string().required(),
   name: joi.string().required(),
   description: joi.string().required(),
   type: joi.string().required(),