diff --git a/src/pages/dashboard/[subdomain]/settings/css.tsx b/src/pages/dashboard/[subdomain]/settings/css.tsx
index 7f643075..3da2ee20 100644
--- a/src/pages/dashboard/[subdomain]/settings/css.tsx
+++ b/src/pages/dashboard/[subdomain]/settings/css.tsx
@@ -42,7 +42,7 @@ export default function SettingsDomainsPage() {
   }, [updateSite.isSuccess, updateSite.isError])
 
   useEffect(() => {
-    if (site.isSuccess && site.data && !form.getFieldState("css")) {
+    if (site.isSuccess && site.data && !form.getValues("css")) {
       form.setValue("css", site.data.css || "")
     }
   }, [form, site.data, site.isSuccess])
diff --git a/src/pages/dashboard/[subdomain]/settings/domains.tsx b/src/pages/dashboard/[subdomain]/settings/domains.tsx
index 6970beeb..63627a01 100644
--- a/src/pages/dashboard/[subdomain]/settings/domains.tsx
+++ b/src/pages/dashboard/[subdomain]/settings/domains.tsx
@@ -45,7 +45,7 @@ export default function SettingsDomainsPage() {
   }, [updateSite])
 
   useEffect(() => {
-    if (site.isSuccess && site.data) {
+    if (site.isSuccess && site.data && !form.getValues("subdomain")) {
       form.setValue("subdomain", site.data.username || "")
     }
   }, [form, site.data, site.isSuccess])