diff --git a/src/app/[orgId]/settings/resources/proxy/[niceId]/general/page.tsx b/src/app/[orgId]/settings/resources/proxy/[niceId]/general/page.tsx
index 9b2c120e..8d3ccab5 100644
--- a/src/app/[orgId]/settings/resources/proxy/[niceId]/general/page.tsx
+++ b/src/app/[orgId]/settings/resources/proxy/[niceId]/general/page.tsx
@@ -226,7 +226,8 @@ export default function GeneralForm() {
                 niceId: data.niceId,
                 subdomain: data.subdomain,
                 fullDomain: updated.fullDomain,
-                proxyPort: data.proxyPort
+                proxyPort: data.proxyPort,
+                domainId: data.domainId
                 // ...(!resource.http && {
                 //     enableProxy: data.enableProxy
                 // })
@@ -489,8 +490,14 @@ export default function GeneralForm() {
                             <DomainPicker
                                 orgId={orgId as string}
                                 cols={1}
-                                defaultSubdomain={resource.subdomain}
-                                defaultDomainId={resource.domainId}
+                                defaultSubdomain={
+                                    selectedDomain?.subdomain ??
+                                    resource.subdomain
+                                }
+                                defaultDomainId={
+                                    selectedDomain?.domainId ??
+                                    resource.domainId
+                                }
                                 onDomainChange={(res) => {
                                     const selected = {
                                         domainId: res.domainId,
diff --git a/src/components/DomainPicker.tsx b/src/components/DomainPicker.tsx
index 5e883add..36e76b2b 100644
--- a/src/components/DomainPicker.tsx
+++ b/src/components/DomainPicker.tsx
@@ -143,6 +143,7 @@ export default function DomainPicker({
                     organizationDomains.find(
                         (domain) => domain.domainId === defaultDomainId
                     ) ?? organizationDomains[0];
+
                 const domainOption: DomainOption = {
                     id: `org-${firstOrgDomain.domainId}`,
                     domain: firstOrgDomain.baseDomain,
@@ -156,7 +157,10 @@ export default function DomainPicker({
                 onDomainChange?.({
                     domainId: firstOrgDomain.domainId,
                     type: "organization",
-                    subdomain: undefined,
+                    subdomain:
+                        firstOrgDomain.type !== "cname"
+                            ? defaultSubdomain || undefined
+                            : undefined,
                     fullDomain: firstOrgDomain.baseDomain,
                     baseDomain: firstOrgDomain.baseDomain
                 });
@@ -177,7 +181,13 @@ export default function DomainPicker({
                 setSelectedBaseDomain(freeDomainOption);
             }
         }
-    }, [hideFreeDomain, loadingDomains, organizationDomains, defaultDomainId]);
+    }, [
+        loadingDomains,
+        organizationDomains,
+        defaultSubdomain,
+        hideFreeDomain,
+        defaultDomainId
+    ]);
 
     const checkAvailability = useCallback(
         async (input: string) => {
@@ -354,7 +364,8 @@ export default function DomainPicker({
             domainNamespaceId: option.domainNamespaceId,
             type:
                 option.type === "provided-search" ? "provided" : "organization",
-            subdomain: sub || undefined,
+            subdomain:
+                option.domainType !== "cname" ? sub || undefined : undefined,
             fullDomain,
             baseDomain: option.domain
         });