diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte
index e24c06905..a05896ba3 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.svelte
@@ -29,8 +29,8 @@
     let behaviour: 'REDIRECT' | 'BRANCH' | 'ACTIVE' = $state('ACTIVE');
     let domainName = $state('');
     let redirect: string = $state(null);
-    let statusCode = $state(307);
     let branch: string = $state(null);
+    let statusCode = $state(StatusCode.TemporaryRedirect307);
 
     onMount(() => {
         if (
@@ -52,10 +52,9 @@
                     .forProject(page.params.region, page.params.project)
                     .proxy.createFunctionRule(domainName, page.params.function, branch);
             } else if (behaviour === 'REDIRECT') {
-                const sc = Object.values(StatusCode).find((code) => parseInt(code) === statusCode);
                 rule = await sdk
                     .forProject(page.params.region, page.params.project)
-                    .proxy.createRedirectRule(domainName, $protocol + redirect, sc);
+                    .proxy.createRedirectRule(domainName, $protocol + redirect, statusCode);
             } else if (behaviour === 'ACTIVE') {
                 rule = await sdk
                     .forProject(page.params.region, page.params.project)
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
index 58499df1c..67970fef5 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.svelte
@@ -12,19 +12,13 @@
     import { protocol } from '$routes/(console)/store';
     import { IconInfo } from '@appwrite.io/pink-icons-svelte';
     import { LabelCard } from '$lib/components';
-    import {
-        Adapter,
-        BuildRuntime,
-        Framework,
-        StatusCode,
-        type Models
-    } from '@appwrite.io/console';
+    import { Adapter, BuildRuntime, Framework, type Models, StatusCode } from '@appwrite.io/console';
     import { statusCodeOptions } from '$lib/stores/domains';
     import { writable } from 'svelte/store';
     import { onMount } from 'svelte';
     import { ConnectRepoModal } from '$lib/components/git/index.js';
     import { project } from '$routes/(console)/project-[region]-[project]/store';
-    import type { Domain } from '$lib/sdk/domains';
+    import { isCloud } from '$lib/system';
 
     const routeBase = `${base}/project-${page.params.region}-${page.params.project}/sites/site-${page.params.site}/domains`;
 
@@ -36,8 +30,8 @@
     let behaviour: 'REDIRECT' | 'BRANCH' | 'ACTIVE' = $state('ACTIVE');
     let domainName = $state('');
     let redirect: string = $state(null);
-    let statusCode = $state(307);
     let branch: string = $state(null);
+    let statusCode = $state(StatusCode.TemporaryRedirect307);
 
     onMount(() => {
         if (
@@ -54,7 +48,7 @@
     async function addDomain() {
         let domain = data.domains?.domains.find((d) => d.domain === domainName);
 
-        if (!domain) {
+        if (!domain && isCloud) {
             try {
                 domain = await sdk.forConsole.domains.create($project.teamId, domainName);
             } catch (error) {
@@ -86,7 +80,9 @@
                 await goto(routeBase);
                 await invalidate(Dependencies.SITES_DOMAINS);
             } else {
-                await goto(`${routeBase}/add-domain/verify-${domain.domain}`);
+                if (isCloud) {
+                    await goto(`${routeBase}/add-domain/verify-${domain.domain}`);
+                }
                 await invalidate(Dependencies.SITES_DOMAINS);
             }
         } catch (error) {
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts
index a39c161de..d49b1c737 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/+page.ts
@@ -2,6 +2,7 @@ import { Query } from '@appwrite.io/console';
 import { sdk } from '$lib/stores/sdk';
 import { RuleTrigger, RuleType } from '$lib/stores/sdk';
 import { Dependencies } from '$lib/constants.js';
+import { isCloud } from '$lib/system';
 
 export const load = async ({ parent, depends, params }) => {
     const { site } = await parent();
@@ -15,7 +16,7 @@ export const load = async ({ parent, depends, params }) => {
                 Query.equal('trigger', RuleTrigger.MANUAL)
             ]),
         sdk.forProject(params.region, params.project).vcs.listInstallations(),
-        sdk.forConsole.domains.list()
+        isCloud ? sdk.forConsole.domains.list() : Promise.resolve(null)
     ]);
 
     return {