diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
index fa97bd5cc..9b521e168 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.svelte
@@ -44,6 +44,7 @@
     );
     const showNSTab = isCloud;
 
+    let proxyRule = $derived(data.proxyRule);
     let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>(getDefaultTab());
     let routeBase = `${base}/project-${page.params.region}-${page.params.project}/functions/function-${page.params.function}/domains`;
     let verified: boolean | undefined = $state(undefined);
@@ -55,7 +56,7 @@
 
     async function verify() {
         try {
-            const apexDomain = getApexDomain(data.proxyRule.domain);
+            const apexDomain = getApexDomain(proxyRule.domain);
             const domain = data.domainsList.domains.find((d) => d.domain === apexDomain);
 
             if (isCloud && domain) {
@@ -68,7 +69,7 @@
         }
 
         try {
-            await sdk
+            proxyRule = await sdk
                 .forProject(page.params.region, page.params.project)
                 .proxy.updateRuleVerification({ ruleId });
 
@@ -97,7 +98,7 @@
                 .forProject(page.params.region, page.params.project)
                 .proxy.deleteRule({ ruleId });
         }
-        await goto(`${routeBase}/add-domain?domain=${data.proxyRule.domain}`);
+        await goto(`${routeBase}/add-domain?domain=${proxyRule.domain}`);
     }
 </script>
 
@@ -114,7 +115,7 @@
                         <Icon icon={IconGlobeAlt} color="--fgcolor-neutral-primary" />
 
                         <Typography.Text variation="m-500" color="--fgcolor-neutral-primary">
-                            {data.proxyRule.domain}
+                            {proxyRule.domain}
                         </Typography.Text>
                     </Layout.Stack>
                     <Button secondary on:click={back}>Change</Button>
@@ -163,15 +164,15 @@
                     {#if selectedTab === 'nameserver'}
                         <NameserverTable
                             {verified}
-                            domain={data.proxyRule.domain}
-                            ruleStatus={data.proxyRule.status} />
+                            domain={proxyRule.domain}
+                            ruleStatus={proxyRule.status} />
                     {:else}
                         <RecordTable
                             {verified}
                             service="functions"
                             variant={selectedTab}
-                            domain={data.proxyRule.domain}
-                            ruleStatus={data.proxyRule.status}
+                            domain={proxyRule.domain}
+                            ruleStatus={proxyRule.status}
                             onNavigateToNameservers={() => (selectedTab = 'nameserver')}
                             onNavigateToA={() => (selectedTab = 'a')}
                             onNavigateToAAAA={() => (selectedTab = 'aaaa')} />
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte
index 1dfec5c96..9dde0cd03 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/retryDomainModal.svelte
@@ -65,7 +65,7 @@
         }
 
         try {
-            await sdk
+            selectedProxyRule = await sdk
                 .forProject(page.params.region, page.params.project)
                 .proxy.updateRuleVerification({ ruleId: selectedProxyRule.$id });
 
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
index 73f27dc72..de96e0ef1 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.svelte
@@ -44,8 +44,8 @@
     );
     const showNSTab = isCloud;
 
+    let proxyRule = $derived(data.proxyRule);
     let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>(getDefaultTab());
-
     const routeBase = `${base}/project-${page.params.region}-${page.params.project}/settings/domains`;
     let verified: boolean | undefined = $state(undefined);
     const isSubmitting = writable(false);
@@ -56,7 +56,7 @@
 
     async function verify() {
         try {
-            const apexDomain = getApexDomain(data.proxyRule.domain);
+            const apexDomain = getApexDomain(proxyRule.domain);
             const domain = data.domainsList.domains.find((d) => d.domain === apexDomain);
             if (isCloud && domain) {
                 await sdk.forConsole.domains.updateNameservers({
@@ -68,7 +68,7 @@
         }
 
         try {
-            await sdk
+            proxyRule = await sdk
                 .forProject(page.params.region, page.params.project)
                 .proxy.updateRuleVerification({ ruleId });
 
@@ -96,7 +96,7 @@
                 .forProject(page.params.region, page.params.project)
                 .proxy.deleteRule({ ruleId });
         }
-        await goto(`${routeBase}/add-domain?domain=${data.proxyRule.domain}`);
+        await goto(`${routeBase}/add-domain?domain=${proxyRule.domain}`);
     }
 </script>
 
@@ -113,7 +113,7 @@
                         <Icon icon={IconGlobeAlt} color="--fgcolor-neutral-primary" />
 
                         <Typography.Text variation="m-500" color="--fgcolor-neutral-primary">
-                            {data.proxyRule.domain}
+                            {proxyRule.domain}
                         </Typography.Text>
                     </Layout.Stack>
                     <Button secondary on:click={back}>Change</Button>
@@ -160,14 +160,14 @@
                         <Divider />
                     </div>
                     {#if selectedTab === 'nameserver'}
-                        <NameserverTable domain={data.proxyRule.domain} {verified} />
+                        <NameserverTable domain={proxyRule.domain} {verified} />
                     {:else}
                         <RecordTable
                             {verified}
                             service="general"
                             variant={selectedTab}
-                            domain={data.proxyRule.domain}
-                            ruleStatus={data.proxyRule.status}
+                            domain={proxyRule.domain}
+                            ruleStatus={proxyRule.status}
                             onNavigateToNameservers={() => (selectedTab = 'nameserver')}
                             onNavigateToA={() => (selectedTab = 'a')}
                             onNavigateToAAAA={() => (selectedTab = 'aaaa')} />
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/settings/domains/retryDomainModal.svelte
index 63c4f527c..2be8cd42f 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/retryDomainModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/retryDomainModal.svelte
@@ -65,7 +65,7 @@
         }
 
         try {
-            await sdk
+            selectedProxyRule = await sdk
                 .forProject(page.params.region, page.params.project)
                 .proxy.updateRuleVerification({ ruleId: selectedProxyRule.$id });
 
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
index 424749bbb..2de38a932 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.svelte
@@ -44,6 +44,7 @@
     );
     const showNSTab = isCloud;
 
+    let proxyRule = $derived(data.proxyRule);
     let selectedTab = $state<'cname' | 'nameserver' | 'a' | 'aaaa'>(getDefaultTab());
     let routeBase = `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/domains`;
     let verified: boolean | undefined = $state(undefined);
@@ -55,7 +56,7 @@
 
     async function verify() {
         try {
-            const apexDomain = getApexDomain(data.proxyRule.domain);
+            const apexDomain = getApexDomain(proxyRule.domain);
             const domain = data.domainsList.domains.find((d) => d.domain === apexDomain);
             if (isCloud && domain) {
                 await sdk.forConsole.domains.updateNameservers({
@@ -67,7 +68,7 @@
         }
 
         try {
-            await sdk
+            proxyRule = await sdk
                 .forProject(page.params.region, page.params.project)
                 .proxy.updateRuleVerification({ ruleId });
 
@@ -96,7 +97,7 @@
                 .forProject(page.params.region, page.params.project)
                 .proxy.deleteRule({ ruleId });
         }
-        await goto(`${routeBase}/add-domain?domain=${data.proxyRule.domain}`);
+        await goto(`${routeBase}/add-domain?domain=${proxyRule.domain}`);
     }
 </script>
 
@@ -113,7 +114,7 @@
                         <Icon icon={IconGlobeAlt} color="--fgcolor-neutral-primary" />
 
                         <Typography.Text variation="m-500" color="--fgcolor-neutral-primary">
-                            {data.proxyRule.domain}
+                            {proxyRule.domain}
                         </Typography.Text>
                     </Layout.Stack>
                     <Button secondary on:click={back}>Change</Button>
@@ -162,15 +163,15 @@
                     {#if selectedTab === 'nameserver'}
                         <NameserverTable
                             {verified}
-                            domain={data.proxyRule.domain}
-                            ruleStatus={data.proxyRule.status} />
+                            domain={proxyRule.domain}
+                            ruleStatus={proxyRule.status} />
                     {:else}
                         <RecordTable
                             {verified}
                             service="sites"
                             variant={selectedTab}
-                            domain={data.proxyRule.domain}
-                            ruleStatus={data.proxyRule.status}
+                            domain={proxyRule.domain}
+                            ruleStatus={proxyRule.status}
                             onNavigateToNameservers={() => (selectedTab = 'nameserver')}
                             onNavigateToA={() => (selectedTab = 'a')}
                             onNavigateToAAAA={() => (selectedTab = 'aaaa')} />
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte
index 17db051a4..cec08f04a 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/retryDomainModal.svelte
@@ -65,7 +65,7 @@
         }
 
         try {
-            await sdk
+            selectedProxyRule = await sdk
                 .forProject(page.params.region, page.params.project)
                 .proxy.updateRuleVerification({ ruleId: selectedProxyRule.$id });