diff --git a/Server/controllers/maintenanceWindowController.js b/Server/controllers/maintenanceWindowController.js
index 9706b4222..cbc50271d 100644
--- a/Server/controllers/maintenanceWindowController.js
+++ b/Server/controllers/maintenanceWindowController.js
@@ -109,7 +109,7 @@ const getMaintenanceWindowsByMonitorId = async (req, res, next) => {
       req.params.monitorId
     );
 
-    return res.status(201).json({
+    return res.status(200).json({
       success: true,
       msg: successMessages.MAINTENANCE_WINDOW_GET_BY_USER,
       data: maintenanceWindows,
diff --git a/Server/tests/controllers/maintenanceWindowController.test.js b/Server/tests/controllers/maintenanceWindowController.test.js
index a133ec98d..161d380ba 100644
--- a/Server/tests/controllers/maintenanceWindowController.test.js
+++ b/Server/tests/controllers/maintenanceWindowController.test.js
@@ -203,3 +203,66 @@ describe("maintenanceWindowController - getMaintenanceWindowsByTeamId", () => {
     stub.restore();
   });
 });
+
+describe("maintenanceWindowController - getMaintenanceWindowsByMonitorId", () => {
+  beforeEach(() => {
+    req = {
+      body: {},
+      params: {
+        monitorId: "123",
+      },
+      query: {},
+      headers: {
+        authorization: "Bearer token",
+      },
+      settingsService: {
+        getSettings: sinon.stub().returns({ jwtSecret: "jwtSecret" }),
+      },
+      db: {
+        getMaintenanceWindowsByMonitorId: sinon.stub(),
+      },
+    };
+    res = {
+      status: sinon.stub().returnsThis(),
+      json: sinon.stub(),
+    };
+    next = sinon.stub();
+  });
+
+  afterEach(() => {
+    sinon.restore();
+  });
+
+  it("should reject if param validation fails", async () => {
+    req.params = {};
+    await getMaintenanceWindowsByMonitorId(req, res, next);
+    expect(next.firstCall.args[0]).to.be.an("error");
+    expect(next.firstCall.args[0].status).to.equal(422);
+  });
+
+  it("should reject with an error if DB operations fail", async () => {
+    req.db.getMaintenanceWindowsByMonitorId.throws(new Error("DB error"));
+    await getMaintenanceWindowsByMonitorId(req, res, next);
+    expect(next.firstCall.args[0]).to.be.an("error");
+    expect(next.firstCall.args[0].message).to.equal("DB error");
+  });
+
+  it("should return success message with data if all operations are successful", async () => {
+    const data = [{ monitorId: "123" }];
+    req.db.getMaintenanceWindowsByMonitorId.returns(data);
+    await getMaintenanceWindowsByMonitorId(req, res, next);
+    expect(
+      req.db.getMaintenanceWindowsByMonitorId.calledOnceWith(
+        req.params.monitorId
+      )
+    );
+    expect(res.status.firstCall.args[0]).to.equal(200);
+    expect(
+      res.json.calledOnceWith({
+        success: true,
+        msg: successMessages.MAINTENANCE_WINDOW_GET_BY_MONITOR,
+        data: data,
+      })
+    ).to.be.true;
+  });
+});