diff --git a/dashboard/src/components/UpdateWebhookModal.tsx b/dashboard/src/components/UpdateWebhookModal.tsx
index 52fc67c..15480a9 100644
--- a/dashboard/src/components/UpdateWebhookModal.tsx
+++ b/dashboard/src/components/UpdateWebhookModal.tsx
@@ -279,13 +279,14 @@ const UpdateWebhookModal = ({
 				[WebhookInputDataFields.HEADERS]: [{ ...initHeadersData }],
 			});
 			setValidator({ ...initWebhookValidatorData });
-			onClose();
 			fetchWebookData();
+			return;
 		}
 		setLoading(false);
 	};
 	useEffect(() => {
 		if (
+			isOpen &&
 			view === UpdateWebhookModalViews.Edit &&
 			selectedWebhook &&
 			Object.keys(selectedWebhook || {}).length
@@ -318,7 +319,7 @@ const UpdateWebhookModal = ({
 				});
 			}
 		}
-	}, [view]);
+	}, [isOpen]);
 	return (
 		<>
 			{view === UpdateWebhookModalViews.ADD ? (
diff --git a/dashboard/src/pages/Webhooks.tsx b/dashboard/src/pages/Webhooks.tsx
index c233819..78d863e 100644
--- a/dashboard/src/pages/Webhooks.tsx
+++ b/dashboard/src/pages/Webhooks.tsx
@@ -115,9 +115,6 @@ const Webhooks = () => {
 	const paginationHandler = (value: Record<string, number>) => {
 		setPaginationProps({ ...paginationProps, ...value });
 	};
-	useEffect(() => {
-		fetchWebookData();
-	}, []);
 	useEffect(() => {
 		fetchWebookData();
 	}, [paginationProps.page, paginationProps.limit]);