diff --git a/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte b/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte
index f4422850c..238d0de7f 100644
--- a/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/billingAddress.svelte
@@ -150,7 +150,7 @@
         bind:selectedAddress={billingAddress} />
 {/if}
 {#if showReplace}
-    <ReplaceAddress bind:show={showReplace} />
+    <ReplaceAddress bind:show={showReplace} {locale} {countryList} />
 {/if}
 {#if showRemove}
     <RemoveAddress bind:show={showRemove} />
diff --git a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
index 4d5fa0577..5ef49d026 100644
--- a/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
+++ b/src/routes/(console)/organization-[organization]/billing/replaceAddress.svelte
@@ -11,9 +11,11 @@
     import { Submit, trackError, trackEvent } from '$lib/actions/analytics';
     import { base } from '$app/paths';
     import { Alert, Badge, Card, Layout, Skeleton } from '@appwrite.io/pink-svelte';
-    import { page } from '$app/state';
+    import type { Models } from '@appwrite.io/console';
 
     export let show = false;
+    export let locale: Models.Locale;
+    export let countryList: Models.CountryList;
     let loading = true;
     let addresses: AddressesList;
     let selectedAddress: string;
@@ -44,13 +46,9 @@
                 : null
             : null;
 
-        const locale = await sdk.forProject(page.params.region, page.params.project).locale.get();
         if (locale?.countryCode) {
             country = locale.countryCode;
         }
-        const countryList = await sdk
-            .forProject(page.params.region, page.params.project)
-            .locale.listCountries();
         options = countryList.countries.map((country) => {
             return {
                 value: country.code,