diff --git a/src/routes/console/account/payments/addressModal.svelte b/src/routes/console/account/payments/addressModal.svelte
index 3a92e8c2ac..fbeb783aff 100644
--- a/src/routes/console/account/payments/addressModal.svelte
+++ b/src/routes/console/account/payments/addressModal.svelte
@@ -47,7 +47,7 @@
                 address,
                 city,
                 state,
-                zip,
+                zip ? zip : undefined,
                 address2 ? address2 : undefined
             );
             trackEvent(Submit.BillingAddressCreate);
diff --git a/src/routes/console/account/payments/editAddressModal.svelte b/src/routes/console/account/payments/editAddressModal.svelte
index 3ad0772d98..bea14ab0e4 100644
--- a/src/routes/console/account/payments/editAddressModal.svelte
+++ b/src/routes/console/account/payments/editAddressModal.svelte
@@ -22,6 +22,10 @@
 
     onMount(async () => {
         const countryList = await sdk.forProject.locale.listCountries();
+        const locale = await sdk.forProject.locale.get();
+        if (locale.countryCode) {
+            selectedAddress.country = locale.countryCode;
+        }
         options = countryList.countries.map((country) => {
             return {
                 value: country.code,
@@ -38,7 +42,7 @@
                 selectedAddress.streetAddress,
                 selectedAddress.city,
                 selectedAddress.state,
-                selectedAddress.postalCode,
+                selectedAddress.postalCode ? selectedAddress.postalCode : undefined,
                 selectedAddress.addressLine2 ? selectedAddress.addressLine2 : undefined
             );
             await invalidate(Dependencies.ADDRESS);
diff --git a/src/routes/console/changeOrganizationTierCloud.svelte b/src/routes/console/changeOrganizationTierCloud.svelte
index 44d28677bc..a11806747a 100644
--- a/src/routes/console/changeOrganizationTierCloud.svelte
+++ b/src/routes/console/changeOrganizationTierCloud.svelte
@@ -96,7 +96,9 @@
                         $changeOrganizationTier.billingAddress.streetAddress,
                         $changeOrganizationTier.billingAddress.city,
                         $changeOrganizationTier.billingAddress.state,
-                        $changeOrganizationTier.billingAddress.postalCode,
+                        $changeOrganizationTier.billingAddress.postalCode
+                            ? $changeOrganizationTier.billingAddress.postalCode
+                            : undefined,
                         $changeOrganizationTier.billingAddress.addressLine2
                             ? $changeOrganizationTier.billingAddress.addressLine2
                             : undefined
diff --git a/src/routes/console/createOrganizationCloud.svelte b/src/routes/console/createOrganizationCloud.svelte
index acc6018a87..a40f68fdb7 100644
--- a/src/routes/console/createOrganizationCloud.svelte
+++ b/src/routes/console/createOrganizationCloud.svelte
@@ -49,7 +49,9 @@
                     $createOrganization.billingAddress.streetAddress,
                     $createOrganization.billingAddress.city,
                     $createOrganization.billingAddress.state,
-                    $createOrganization.billingAddress.postalCode,
+                    $createOrganization.billingAddress.postalCode
+                        ? $createOrganization.billingAddress.postalCode
+                        : undefined,
                     $createOrganization.billingAddress.addressLine2
                         ? $createOrganization.billingAddress.addressLine2
                         : undefined
diff --git a/src/routes/console/organization-[organization]/billing/replaceAddress.svelte b/src/routes/console/organization-[organization]/billing/replaceAddress.svelte
index 75dfae08a2..0eb06bbef7 100644
--- a/src/routes/console/organization-[organization]/billing/replaceAddress.svelte
+++ b/src/routes/console/organization-[organization]/billing/replaceAddress.svelte
@@ -27,6 +27,7 @@
             label: 'United States'
         }
     ];
+
     onMount(async () => {
         addresses = await sdk.forConsole.billing.listAddresses();
 
@@ -61,8 +62,8 @@
                     streetAddress,
                     city,
                     state,
-                    postalCode,
-                    addressLine2
+                    postalCode ? postalCode : undefined,
+                    addressLine2 ? postalCode : undefined
                 );
                 await sdk.forConsole.billing.setBillingAddress($organization.$id, address.$id);