diff --git a/app/components/dialog/delete.tsx b/app/components/dialog/delete.tsx
index f8b066e..94d16ed 100644
--- a/app/components/dialog/delete.tsx
+++ b/app/components/dialog/delete.tsx
@@ -25,13 +25,11 @@ export const DialogDelete = (properties: TProperties) => {
   useEffect(() => {
     if (!fetcher.data?.success && fetcher.data?.message) {
       toast.error(fetcher.data.message)
-      return
     }
 
     if (fetcher.data?.success) {
       close()
       toast.success(`${title} berhasil dihapus!`)
-      return
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher.data])
diff --git a/app/layouts/admin/dialog-profile.tsx b/app/layouts/admin/dialog-profile.tsx
index d4b4b7a..c712580 100644
--- a/app/layouts/admin/dialog-profile.tsx
+++ b/app/layouts/admin/dialog-profile.tsx
@@ -31,12 +31,10 @@ export const DialogProfile = () => {
   useEffect(() => {
     if (!fetcher.data?.success && fetcher.data?.message) {
       toast.error(fetcher.data.message)
-      return
     }
 
     if (fetcher.data?.success) {
       setEditProfile(false)
-      return
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher.data])
diff --git a/app/layouts/admin/dialog-upload.tsx b/app/layouts/admin/dialog-upload.tsx
index 2a2fbec..05deeee 100644
--- a/app/layouts/admin/dialog-upload.tsx
+++ b/app/layouts/admin/dialog-upload.tsx
@@ -32,10 +32,11 @@ export const DialogUpload = () => {
   useEffect(() => {
     if (!fetcher.data?.success && fetcher.data?.message) {
       toast.error(fetcher.data.message)
-      return
     }
 
-    setUploadedFile(fetcher.data.uploadData.data.file_url)
+    if (fetcher.data?.success) {
+      setUploadedFile(fetcher.data.uploadData.data.file_url)
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher.data])
 
diff --git a/app/layouts/news/dialog-login.tsx b/app/layouts/news/dialog-login.tsx
index d85f0a9..392dc1e 100644
--- a/app/layouts/news/dialog-login.tsx
+++ b/app/layouts/news/dialog-login.tsx
@@ -41,7 +41,9 @@ export const DialogLogin = () => {
       return
     }
 
-    setIsLoginOpen(false)
+    if (fetcher.data?.success) {
+      setIsLoginOpen(false)
+    }
 
     if (fetcher.data?.user.subscribe?.subscribe_plan?.code === 'basic') {
       setIsSubscribeOpen(true)
diff --git a/app/layouts/news/dialog-register.tsx b/app/layouts/news/dialog-register.tsx
index 5ebc927..16afc38 100644
--- a/app/layouts/news/dialog-register.tsx
+++ b/app/layouts/news/dialog-register.tsx
@@ -60,11 +60,12 @@ export const DialogRegister = () => {
   useEffect(() => {
     if (!fetcher.data?.success && fetcher.data?.message) {
       toast.error(fetcher.data.message)
-      return
     }
 
-    setIsRegisterOpen(false)
-    setIsSuccessOpen('register')
+    if (fetcher.data?.success) {
+      setIsRegisterOpen(false)
+      setIsSuccessOpen('register')
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher.data])
 
diff --git a/app/layouts/news/dialog-subscribe-plan.tsx b/app/layouts/news/dialog-subscribe-plan.tsx
index b37ac6d..67e1471 100644
--- a/app/layouts/news/dialog-subscribe-plan.tsx
+++ b/app/layouts/news/dialog-subscribe-plan.tsx
@@ -45,11 +45,12 @@ export const DialogSubscribePlan = () => {
   useEffect(() => {
     if (!fetcher.data?.success && fetcher.data?.message) {
       toast.error(fetcher.data.message)
-      return
     }
 
-    setIsSubscribeOpen(false)
-    setIsSuccessOpen('payment')
+    if (fetcher.data?.success) {
+      setIsSubscribeOpen(false)
+      setIsSuccessOpen('payment')
+    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher.data])
 
diff --git a/app/pages/form-advertisements/index.tsx b/app/pages/form-advertisements/index.tsx
index d2693bb..c6900ab 100644
--- a/app/pages/form-advertisements/index.tsx
+++ b/app/pages/form-advertisements/index.tsx
@@ -54,13 +54,11 @@ export const FormAdvertisementsPage = (properties: TProperties) => {
   useEffect(() => {
     if (!fetcher.data?.success && fetcher.data?.message) {
       toast.error(fetcher.data.message)
-      return
     }
 
     if (fetcher.data?.success) {
       toast.success(`Banner iklan berhasil ${adData ? 'diupdate' : 'dibuat'}!`)
       navigate('/lg-admin/advertisements')
-      return
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher.data])
diff --git a/app/pages/form-category/index.tsx b/app/pages/form-category/index.tsx
index 19b6617..c2bc5ee 100644
--- a/app/pages/form-category/index.tsx
+++ b/app/pages/form-category/index.tsx
@@ -46,7 +46,6 @@ export const FormCategoryPage = (properties: TProperties) => {
   useEffect(() => {
     if (!fetcher.data?.success && fetcher.data?.message) {
       toast.error(fetcher.data.message)
-      return
     }
 
     if (fetcher.data?.success) {
@@ -54,7 +53,6 @@ export const FormCategoryPage = (properties: TProperties) => {
         `Kategori berhasil ${categoryData ? 'diupdate' : 'dibuat'}!`,
       )
       navigate('/lg-admin/categories')
-      return
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher.data])
diff --git a/app/pages/form-contents/index.tsx b/app/pages/form-contents/index.tsx
index da881c0..b844767 100644
--- a/app/pages/form-contents/index.tsx
+++ b/app/pages/form-contents/index.tsx
@@ -98,13 +98,11 @@ export const FormContentsPage = (properties: TProperties) => {
   useEffect(() => {
     if (!fetcher.data?.success && fetcher.data?.message) {
       toast.error(fetcher.data.message)
-      return
     }
 
     if (fetcher.data?.success) {
       toast.success(`Artikel berhasil ${newsData ? 'diupdate' : 'dibuat'}!`)
       navigate('/lg-admin/contents')
-      return
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher.data])
diff --git a/app/pages/form-subscribe-plan/index.tsx b/app/pages/form-subscribe-plan/index.tsx
index c932b34..e0d3d4f 100644
--- a/app/pages/form-subscribe-plan/index.tsx
+++ b/app/pages/form-subscribe-plan/index.tsx
@@ -50,7 +50,6 @@ export const FormSubscribePlanPage = (properties: TProperties) => {
   useEffect(() => {
     if (!fetcher.data?.success && fetcher.data?.message) {
       toast.error(fetcher.data.message)
-      return
     }
 
     if (fetcher.data?.success) {
@@ -58,7 +57,6 @@ export const FormSubscribePlanPage = (properties: TProperties) => {
         `Subscribe Plan berhasil ${subscribePlanData ? 'diupdate' : 'dibuat'}!`,
       )
       navigate('/lg-admin/subscribe-plan')
-      return
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher.data])
diff --git a/app/pages/form-tag/index.tsx b/app/pages/form-tag/index.tsx
index 26845ea..4ae5d02 100644
--- a/app/pages/form-tag/index.tsx
+++ b/app/pages/form-tag/index.tsx
@@ -42,13 +42,11 @@ export const FormTagPage = (properties: TProperties) => {
   useEffect(() => {
     if (!fetcher.data?.success && fetcher.data?.message) {
       toast.error(fetcher.data.message)
-      return
     }
 
     if (fetcher.data?.success) {
       toast.success(`Tag berhasil ${tagData ? 'diupdate' : 'dibuat'}!`)
       navigate('/lg-admin/tags')
-      return
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher.data])
diff --git a/app/pages/staff-login/index.tsx b/app/pages/staff-login/index.tsx
index 2bbae5f..9fbab72 100644
--- a/app/pages/staff-login/index.tsx
+++ b/app/pages/staff-login/index.tsx
@@ -29,7 +29,6 @@ export const AdminLoginPage = () => {
   useEffect(() => {
     if (!fetcher.data?.success && fetcher.data?.message) {
       toast.error(fetcher.data.message)
-      return
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fetcher.data])