diff --git a/src/routes/(console)/organization-[organization]/domains/+page.ts b/src/routes/(console)/organization-[organization]/domains/+page.ts
index d517387314..eaa4368af3 100644
--- a/src/routes/(console)/organization-[organization]/domains/+page.ts
+++ b/src/routes/(console)/organization-[organization]/domains/+page.ts
@@ -4,8 +4,10 @@ import { getLimit, getPage, getQuery, getSearch, pageToOffset } from '$lib/helpe
 import { Dependencies, PAGE_LIMIT } from '$lib/constants';
 import { queries, queryParamToMap } from '$lib/components/filters';
 
-export const load = async ({ depends, url, route }) => {
+export const load = async ({ depends, url, route, parent }) => {
+    const { organization } = await parent();
     depends(Dependencies.DOMAINS);
+
     const page = getPage(url);
     const limit = getLimit(url, route, PAGE_LIMIT);
     const offset = pageToOffset(page, limit);
@@ -24,6 +26,7 @@ export const load = async ({ depends, url, route }) => {
             Query.limit(limit),
             Query.offset(offset),
             Query.orderDesc(''),
+            Query.equal('teamId', organization.$id),
             ...parsedQueries.values()
         ])
     };
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.ts
index d623504b3a..5de7f51a8b 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/+page.ts
@@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants';
 import { isCloud } from '$lib/system';
 
 export const load = async ({ parent, depends, params }) => {
-    const { function: func } = await parent();
+    const { function: func, organization } = await parent();
     depends(Dependencies.DOMAINS, Dependencies.FUNCTION_DOMAINS);
 
     const [rules, installations, domains] = await Promise.all([
@@ -16,7 +16,9 @@ export const load = async ({ parent, depends, params }) => {
                 Query.equal('trigger', RuleTrigger.MANUAL)
             ]),
         sdk.forProject(params.region, params.project).vcs.listInstallations(),
-        isCloud ? sdk.forConsole.domains.list() : Promise.resolve(null)
+        isCloud
+            ? sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)])
+            : Promise.resolve(null)
     ]);
 
     return {
diff --git a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts
index 645667970f..8f49a73433 100644
--- a/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/functions/function-[function]/domains/add-domain/verify-[domain]/+page.ts
@@ -1,14 +1,15 @@
 import { sdk } from '$lib/stores/sdk';
 import { isCloud } from '$lib/system';
 import { Dependencies } from '$lib/constants.js';
-import type { Models } from '@appwrite.io/console';
+import { type Models, Query } from '@appwrite.io/console';
 
-export const load = async ({ depends }) => {
+export const load = async ({ depends, parent }) => {
+    const { organization } = await parent();
     depends(Dependencies.DOMAINS);
 
     let domainsList: Models.DomainsList;
     if (isCloud) {
-        domainsList = await sdk.forConsole.domains.list();
+        domainsList = await sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)]);
     }
 
     return {
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts
index a5408d22d3..5226f40dcc 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/+page.ts
@@ -4,7 +4,8 @@ import { RuleTrigger, RuleType } from '$lib/stores/sdk';
 import { Dependencies } from '$lib/constants.js';
 import { isCloud } from '$lib/system';
 
-export const load = async ({ depends, params }) => {
+export const load = async ({ depends, params, parent }) => {
+    const { organization } = await parent();
     depends(Dependencies.DOMAINS);
 
     const [rules, domains] = await Promise.all([
@@ -14,7 +15,9 @@ export const load = async ({ depends, params }) => {
                 Query.equal('type', RuleType.API),
                 Query.equal('trigger', RuleTrigger.MANUAL)
             ]),
-        isCloud ? sdk.forConsole.domains.list() : Promise.resolve(null)
+        isCloud
+            ? sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)])
+            : Promise.resolve(null)
     ]);
 
     return {
diff --git a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts
index 645667970f..8f49a73433 100644
--- a/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/settings/domains/add-domain/verify-[domain]/+page.ts
@@ -1,14 +1,15 @@
 import { sdk } from '$lib/stores/sdk';
 import { isCloud } from '$lib/system';
 import { Dependencies } from '$lib/constants.js';
-import type { Models } from '@appwrite.io/console';
+import { type Models, Query } from '@appwrite.io/console';
 
-export const load = async ({ depends }) => {
+export const load = async ({ depends, parent }) => {
+    const { organization } = await parent();
     depends(Dependencies.DOMAINS);
 
     let domainsList: Models.DomainsList;
     if (isCloud) {
-        domainsList = await sdk.forConsole.domains.list();
+        domainsList = await sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)]);
     }
 
     return {
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 d49b1c7372..ef6239640e 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
@@ -5,7 +5,7 @@ import { Dependencies } from '$lib/constants.js';
 import { isCloud } from '$lib/system';
 
 export const load = async ({ parent, depends, params }) => {
-    const { site } = await parent();
+    const { site, organization } = await parent();
     depends(Dependencies.DOMAINS, Dependencies.SITES_DOMAINS);
 
     const [rules, installations, domains] = await Promise.all([
@@ -16,7 +16,9 @@ export const load = async ({ parent, depends, params }) => {
                 Query.equal('trigger', RuleTrigger.MANUAL)
             ]),
         sdk.forProject(params.region, params.project).vcs.listInstallations(),
-        isCloud ? sdk.forConsole.domains.list() : Promise.resolve(null)
+        isCloud
+            ? sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)])
+            : Promise.resolve(null)
     ]);
 
     return {
diff --git a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts
index 1375f1f999..e56bf02b98 100644
--- a/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts
+++ b/src/routes/(console)/project-[region]-[project]/sites/site-[site]/domains/add-domain/verify-[domain]/+page.ts
@@ -1,16 +1,15 @@
 import { sdk } from '$lib/stores/sdk';
 import { isCloud } from '$lib/system';
 import { Dependencies } from '$lib/constants.js';
-import type { Models } from '@appwrite.io/console';
+import { type Models, Query } from '@appwrite.io/console';
 
 export const load = async ({ parent, depends }) => {
-    const { site } = await parent();
+    const { site, organization } = await parent();
     depends(Dependencies.SITES_DOMAINS);
 
     let domainsList: Models.DomainsList;
-
     if (isCloud) {
-        domainsList = await sdk.forConsole.domains.list();
+        domainsList = await sdk.forConsole.domains.list([Query.equal('teamId', organization.$id)]);
     }
 
     return {