diff --git a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
index 817e414b6..25847b1be 100644
--- a/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/Components/MonitorsTable/index.jsx
@@ -68,8 +68,16 @@ const MonitorsTable = ({ shouldRender, monitors, isAdmin, handleActionMenuDelete
 			),
 		},
 		{ id: "cpu", content: t("cpu"), render: (row) => <CustomGauge progress={row.cpu} /> },
-		{ id: "memory", content: t("memory"), render: (row) => <CustomGauge progress={row.mem} /> },
-		{ id: "disk", content: t("disk"), render: (row) => <CustomGauge progress={row.disk} /> },
+		{
+			id: "memory",
+			content: t("memory"),
+			render: (row) => <CustomGauge progress={row.mem} />,
+		},
+		{
+			id: "disk",
+			content: t("disk"),
+			render: (row) => <CustomGauge progress={row.disk} />,
+		},
 		{
 			id: "actions",
 			content: t("actions"),
@@ -129,6 +137,7 @@ const MonitorsTable = ({ shouldRender, monitors, isAdmin, handleActionMenuDelete
 					},
 				},
 				onRowClick: (row) => openDetails(row.id),
+				emptyView: "No monitors found",
 			}}
 		/>
 	);
diff --git a/client/src/Pages/Infrastructure/Monitors/index.jsx b/client/src/Pages/Infrastructure/Monitors/index.jsx
index cc2a03138..0d22e98b5 100644
--- a/client/src/Pages/Infrastructure/Monitors/index.jsx
+++ b/client/src/Pages/Infrastructure/Monitors/index.jsx
@@ -73,7 +73,7 @@ const InfrastructureMonitors = () => {
 		);
 	}
 
-	if (!isLoading && monitors?.length === 0) {
+	if (!isLoading && typeof summary?.totalMonitors === "undefined" ) {
 		return (
 			<Fallback
 				vowelStart={true}