diff --git a/Client/src/Components/Dialog/index.jsx b/Client/src/Components/Dialog/index.jsx
index d138ab983..fdc34c0c1 100644
--- a/Client/src/Components/Dialog/index.jsx
+++ b/Client/src/Components/Dialog/index.jsx
@@ -7,7 +7,6 @@ const Dialog = ({
 	title,
 	description,
 	open,
-	onClose,
 	theme,
 	onCancel,
 	confirmationButtonLabel,
@@ -19,7 +18,7 @@ const Dialog = ({
 			title={title}
 			description={description}
 			open={open}
-			onClose={onClose}
+			onClose={onCancel}
 			theme={theme}
 		>
 			<Stack
diff --git a/Client/src/Components/TabPanels/Account/ProfilePanel.jsx b/Client/src/Components/TabPanels/Account/ProfilePanel.jsx
index 27f5a2ac0..710d6a59f 100644
--- a/Client/src/Components/TabPanels/Account/ProfilePanel.jsx
+++ b/Client/src/Components/TabPanels/Account/ProfilePanel.jsx
@@ -374,7 +374,6 @@ const ProfilePanel = () => {
 
 			<Dialog
 				open={isModalOpen("delete")}
-				onClose={() => setIsOpen("")}
 				theme={theme}
 				title={"Really delete this account?"}
 				description={
diff --git a/Client/src/Pages/Maintenance/MaintenanceTable/ActionsMenu/index.jsx b/Client/src/Pages/Maintenance/MaintenanceTable/ActionsMenu/index.jsx
index b0e571fd6..8928b1e05 100644
--- a/Client/src/Pages/Maintenance/MaintenanceTable/ActionsMenu/index.jsx
+++ b/Client/src/Pages/Maintenance/MaintenanceTable/ActionsMenu/index.jsx
@@ -150,10 +150,6 @@ const ActionsMenu = ({ /* isAdmin, */ maintenanceWindow, updateCallback }) => {
 			</Menu>
 			<Dialog
 				open={isOpen}
-				onClose={(e) => {
-					e.stopPropagation();
-					setIsOpen(false);
-				}}
 				theme={theme}
 				title={"Do you really want to remove this maintenance window?"}
 				onCancel={(e) => {
diff --git a/Client/src/Pages/Monitors/Configure/index.jsx b/Client/src/Pages/Monitors/Configure/index.jsx
index 8ef557f5e..22cc8618e 100644
--- a/Client/src/Pages/Monitors/Configure/index.jsx
+++ b/Client/src/Pages/Monitors/Configure/index.jsx
@@ -456,7 +456,6 @@ const Configure = () => {
 
 			<Dialog
 				open={isOpen}
-				onClose={() => setIsOpen(false)}
 				theme={theme}
 				title="Do you really want to delete this monitor?"
 				description="Once deleted, this monitor cannot be retrieved."
diff --git a/Client/src/Pages/Monitors/Home/actionsMenu.jsx b/Client/src/Pages/Monitors/Home/actionsMenu.jsx
index e72bb545f..7efffa93c 100644
--- a/Client/src/Pages/Monitors/Home/actionsMenu.jsx
+++ b/Client/src/Pages/Monitors/Home/actionsMenu.jsx
@@ -189,7 +189,6 @@ const ActionsMenu = ({ monitor, isAdmin, updateCallback }) => {
 			</Menu>
 			<Dialog
 				open={isOpen}
-				onClose={() => setIsOpen(false)}
 				theme={theme}
 				title="Do you really want to delete this monitor?"
 				description="Once deleted, this monitor cannot be retrieved."
diff --git a/Client/src/Pages/PageSpeed/Configure/index.jsx b/Client/src/Pages/PageSpeed/Configure/index.jsx
index 50488548a..222fa733f 100644
--- a/Client/src/Pages/PageSpeed/Configure/index.jsx
+++ b/Client/src/Pages/PageSpeed/Configure/index.jsx
@@ -434,7 +434,6 @@ const PageSpeedConfigure = () => {
 			)}
 			<Dialog
 				open={isOpen}
-				onClose={() => setIsOpen(false)}
 				theme={theme}
 				title={"Do you really want to delete this monitor?"}
 				description={"Once deleted, this monitor cannot be retrieved."}
diff --git a/Client/src/Pages/Settings/index.jsx b/Client/src/Pages/Settings/index.jsx
index b88650400..9a8913c39 100644
--- a/Client/src/Pages/Settings/index.jsx
+++ b/Client/src/Pages/Settings/index.jsx
@@ -264,7 +264,6 @@ const Settings = ({ isAdmin }) => {
 						</Stack>
 						<Dialog
 							open={isOpen.deleteStats}
-							onClose={() => setIsOpen(deleteStatsMonitorsInitState)}
 							theme={theme}
 							title="Do you want to clear all stats?"
 							description="Once deleted, this monitor cannot be retrieved."
@@ -313,7 +312,6 @@ const Settings = ({ isAdmin }) => {
 						</Stack>
 						<Dialog
 							open={isOpen.deleteMonitors}
-							onClose={() => setIsOpen(deleteStatsMonitorsInitState)}
 							theme={theme}
 							title="Do you want to remove all monitors?"
 							onCancel={() => setIsOpen(deleteStatsMonitorsInitState)}