diff --git a/client/src/Pages/Infrastructure/Monitors/index.jsx b/client/src/Pages/Infrastructure/Monitors/index.jsx
index b25636fa9..e4add415c 100644
--- a/client/src/Pages/Infrastructure/Monitors/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/index.jsx
@@ -71,7 +71,7 @@ const InfrastructureMonitors = () => {
 
 	const field = toFilterStatus !== undefined ? "status" : undefined;
 
-	const [monitors, count, isLoading, networkError] = useFetchMonitorsWithChecks({
+	const [summary, monitors, count, isLoading, networkError] = useFetchMonitorsWithChecks({
 		types: TYPES,
 		limit: 1,
 		page: page,
diff --git a/client/src/Pages/PageSpeed/Monitors/Components/MonitorGrid/index.jsx b/client/src/Pages/PageSpeed/Monitors/Components/MonitorGrid/index.jsx
index 6b0a800fb..8708502cd 100644
--- a/client/src/Pages/PageSpeed/Monitors/Components/MonitorGrid/index.jsx
+++ b/client/src/Pages/PageSpeed/Monitors/Components/MonitorGrid/index.jsx
@@ -2,6 +2,7 @@ import { Grid, Grid2 } from "@mui/material";
 import Card from "../Card/index.jsx";
 
 const MonitorGrid = ({ shouldRender, monitors }) => {
+	console.log(monitors);
 	return (
 		<Grid
 			container
diff --git a/client/src/Pages/PageSpeed/Monitors/index.jsx b/client/src/Pages/PageSpeed/Monitors/index.jsx
index 4530a41e9..f1bfcd0dd 100644
--- a/client/src/Pages/PageSpeed/Monitors/index.jsx
+++ b/client/src/Pages/PageSpeed/Monitors/index.jsx
@@ -21,6 +21,7 @@ const PageSpeed = () => {
 	const isAdmin = useIsAdmin();
 
 	const [
+		summary,
 		monitorsWithChecks,
 		monitorsWithChecksCount,
 		monitorsWithChecksIsLoading,
diff --git a/client/src/Pages/Uptime/Monitors/index.jsx b/client/src/Pages/Uptime/Monitors/index.jsx
index 4328715f2..101020eea 100644
--- a/client/src/Pages/Uptime/Monitors/index.jsx
+++ b/client/src/Pages/Uptime/Monitors/index.jsx
@@ -26,7 +26,10 @@ import { useNavigate } from "react-router-dom";
 import { useSelector, useDispatch } from "react-redux";
 import { setRowsPerPage } from "../../../Features/UI/uiSlice.js";
 import PropTypes from "prop-types";
-import { useFetchMonitorsWithChecks } from "@/Hooks/monitorHooks.js";
+import {
+	useFetchMonitorsWithChecks,
+	useFetchMonitorsByTeamId,
+} from "@/Hooks/monitorHooks.js";
 import { useTranslation } from "react-i18next";
 
 const TYPES = ["http", "ping", "docker", "port", "game"];
@@ -136,6 +139,11 @@ const UptimeMonitors = () => {
 		monitorUpdateTrigger,
 	});
 
+	const [monitors, listIsLoading, listNetworkError] = useFetchMonitorsByTeamId({
+		type: ["http", "ping", "docker", "port", "game"],
+	});
+
+	console.log(monitors);
 	useEffect(() => {
 		if (isSearching) {
 			setPage(undefined);
@@ -149,7 +157,7 @@ const UptimeMonitors = () => {
 			<PageStateWrapper
 				networkError={networkError}
 				isLoading={isLoading}
-				items={monitorsWithChecks}
+				items={monitors}
 				type="uptimeMonitor"
 				fallbackLink="/uptime/create"
 			>
@@ -187,7 +195,7 @@ const UptimeMonitors = () => {
 							handleReset={handleReset}
 						/>
 						<SearchComponent
-							monitors={monitorsWithChecks}
+							monitors={monitors}
 							onSearchChange={setSearch}
 							setIsSearching={setIsSearching}
 						/>
diff --git a/server/src/repositories/monitors/MongoMonitorsRepository.ts b/server/src/repositories/monitors/MongoMonitorsRepository.ts
index 970371b17..a7b933851 100644
--- a/server/src/repositories/monitors/MongoMonitorsRepository.ts
+++ b/server/src/repositories/monitors/MongoMonitorsRepository.ts
@@ -44,7 +44,7 @@ class MongoMonitorsRepository implements IMonitorsRepository {
 	};
 
 	findByTeamId = async (teamId: string, config: TeamQueryConfig): Promise<Monitor[] | null> => {
-		const { page = 0, rowsPerPage = 5, filter, field = "createdAt", order = "desc", type, limit } = config ?? {};
+		const { page = 0, rowsPerPage = 0, filter, field = "createdAt", order = "desc", type, limit } = config ?? {};
 
 		const query: Record<string, unknown> = {
 			teamId: new mongoose.Types.ObjectId(teamId),