diff --git a/client/src/Components/v2/design-elements/BasePage.tsx b/client/src/Components/v2/design-elements/BasePage.tsx
index e5091091e..4daf0cd16 100644
--- a/client/src/Components/v2/design-elements/BasePage.tsx
+++ b/client/src/Components/v2/design-elements/BasePage.tsx
@@ -121,7 +121,7 @@ export const BasePageWithStates = ({
 }: BasePageWithStatesProps) => {
 	const showLoading = loading && (!items || items.length === 0);
 
-	if (isEmpty(items)) {
+	if (!loading && isEmpty(items)) {
 		return (
 			<EmptyFallback
 				bullets={bullets}
diff --git a/client/src/Pages/Maintenance/MaintenanceWindowTable.tsx b/client/src/Pages/Maintenance/MaintenanceWindowTable.tsx
index 19767238b..b3033e9dd 100644
--- a/client/src/Pages/Maintenance/MaintenanceWindowTable.tsx
+++ b/client/src/Pages/Maintenance/MaintenanceWindowTable.tsx
@@ -24,7 +24,7 @@ interface MaintenanceWindowTableProps {
 	maintenanceWindowCount: number;
 	page: number;
 	setPage: (page: number) => void;
-	updateCallback: () => void;
+	refetch: () => void;
 }
 
 const getTimeToNextWindow = (
@@ -68,7 +68,7 @@ export const MaintenanceWindowTable = ({
 	maintenanceWindowCount,
 	page,
 	setPage,
-	updateCallback,
+	refetch,
 }: MaintenanceWindowTableProps) => {
 	const theme = useTheme();
 	const { t } = useTranslation();
@@ -88,7 +88,7 @@ export const MaintenanceWindowTable = ({
 		if (!selectedWindow) return;
 		const result = await deleteFn(`/maintenance-window/${selectedWindow.id}`);
 		if (result) {
-			updateCallback();
+			refetch();
 			setDeleteDialogOpen(false);
 			setSelectedWindow(null);
 		}
@@ -99,7 +99,7 @@ export const MaintenanceWindowTable = ({
 			active: !maintenanceWindow.active,
 		});
 		if (result) {
-			updateCallback();
+			refetch();
 		}
 	};
 
diff --git a/client/src/Pages/Maintenance/index.tsx b/client/src/Pages/Maintenance/index.tsx
index 9ba72daa1..5a1d29fc0 100644
--- a/client/src/Pages/Maintenance/index.tsx
+++ b/client/src/Pages/Maintenance/index.tsx
@@ -23,14 +23,6 @@ const MaintenanceWindowPage = () => {
 		`/maintenance-window/team?page=${page}&rowsPerPage=${rowsPerPage}`
 	);
 
-	const handleUpdate = useCallback(() => {
-		refetch();
-	}, [refetch]);
-
-	const handlePageChange = useCallback((newPage: number) => {
-		setPage(newPage);
-	}, []);
-
 	const maintenanceWindows = data?.maintenanceWindows ?? [];
 	const maintenanceWindowCount = data?.maintenanceWindowCount ?? 0;
 
@@ -50,8 +42,8 @@ const MaintenanceWindowPage = () => {
 				maintenanceWindows={maintenanceWindows}
 				maintenanceWindowCount={maintenanceWindowCount}
 				page={page}
-				setPage={handlePageChange}
-				updateCallback={handleUpdate}
+				setPage={setPage}
+				refetch={refetch}
 			/>
 		</BasePageWithStates>
 	);
diff --git a/server/src/routes/maintenanceWindowRoute.ts b/server/src/routes/maintenanceWindowRoute.ts
index 0230ba4bd..539f2413f 100755
--- a/server/src/routes/maintenanceWindowRoute.ts
+++ b/server/src/routes/maintenanceWindowRoute.ts
@@ -16,7 +16,7 @@ class MaintenanceWindowRoutes {
 		this.router.get("/monitor/:monitorId", this.mwController.getMaintenanceWindowsByMonitorId);
 
 		this.router.get("/:id", this.mwController.getMaintenanceWindowById);
-		this.router.put("/:id", this.mwController.editMaintenanceWindow);
+		this.router.patch("/:id", this.mwController.editMaintenanceWindow);
 		this.router.delete("/:id", this.mwController.deleteMaintenanceWindow);
 	}