diff --git a/src/lib/components/domains/recordTable.svelte b/src/lib/components/domains/recordTable.svelte
index 1114bde74..29a131368 100644
--- a/src/lib/components/domains/recordTable.svelte
+++ b/src/lib/components/domains/recordTable.svelte
@@ -73,18 +73,24 @@
             <Typography.Text variant="l-500" color="--fgcolor-neutral-primary">
                 {domain}
             </Typography.Text>
-            {#if ruleStatus === 'created'}
-                <Badge variant="secondary" type="error" size="xs" content="Verification failed" />
-            {:else if ruleStatus === 'verifying'}
-                <Badge variant="secondary" size="xs" content="Generating certificate" />
-            {:else if ruleStatus === 'unverified'}
-                <Badge
-                    variant="secondary"
-                    type="error"
-                    size="xs"
-                    content="Certificate generation failed" />
-            {:else if verified === true}
-                <Badge variant="secondary" type="success" size="xs" content="Verified" />
+            {#if verified !== undefined}
+                {#if ruleStatus === 'created'}
+                    <Badge
+                        variant="secondary"
+                        type="error"
+                        size="xs"
+                        content="Verification failed" />
+                {:else if ruleStatus === 'verifying'}
+                    <Badge variant="secondary" size="xs" content="Generating certificate" />
+                {:else if ruleStatus === 'unverified'}
+                    <Badge
+                        variant="secondary"
+                        type="error"
+                        size="xs"
+                        content="Certificate generation failed" />
+                {:else if verified === true}
+                    <Badge variant="secondary" type="success" size="xs" content="Verified" />
+                {/if}
             {/if}
         </Layout.Stack>
         <Typography.Text variant="m-400">
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+layout.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+layout.svelte
index c05316e53..2238903e4 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/+layout.svelte
@@ -7,12 +7,8 @@
     import { ProxyRuleDeploymentResourceType, type Models } from '@appwrite.io/console';
 
     onMount(() => {
-        return realtime.forProject(page.params.region, page.params.project, (response) => {
-            if (
-                response.events.includes('rules.*.update') ||
-                response.events.includes('rules.*.create') ||
-                response.events.includes('rules.*.delete')
-            ) {
+        return realtime.forProject(page.params.region, ['console', 'project'], (response) => {
+            if (response.events.includes('rules.*.update')) {
                 const proxyRule = response.payload as Models.ProxyRule;
                 if (
                     proxyRule.deploymentResourceType === ProxyRuleDeploymentResourceType.Function &&
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+layout.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+layout.svelte
index 72174cbae..c06e806c7 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+layout.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/+layout.svelte
@@ -7,16 +7,12 @@
     import { ProxyRuleDeploymentResourceType, type Models } from '@appwrite.io/console';
 
     onMount(() => {
-        return realtime.forProject(page.params.region, page.params.project, (response) => {
-            if (
-                response.events.includes('rules.*.update') ||
-                response.events.includes('rules.*.create') ||
-                response.events.includes('rules.*.delete')
-            ) {
+        return realtime.forProject(page.params.region, ['console', 'project'], (response) => {
+            if (response.events.includes('rules.*.update')) {
                 const proxyRule = response.payload as Models.ProxyRule;
                 if (
                     proxyRule.deploymentResourceType === ProxyRuleDeploymentResourceType.Site &&
-                    proxyRule.deploymentResourceId === page.params.function
+                    proxyRule.deploymentResourceId === page.params.site
                 ) {
                     invalidate(Dependencies.SITES_DOMAINS);
                 }
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 6bec3c444..13b88fb19 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,7 +44,7 @@
         }
     });
 
-    let verified = $state(false);
+    let verified: boolean | undefined = $state(undefined);
 
     let routeBase = `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/domains`;
     let isSubmitting = $state(writable(false));