diff --git a/packages/theme/helpers/checkout/address.ts b/packages/theme/helpers/checkout/address.ts
index 79fb2ed07..82e485640 100644
--- a/packages/theme/helpers/checkout/address.ts
+++ b/packages/theme/helpers/checkout/address.ts
@@ -1,3 +1,4 @@
+import { isEqual } from 'lodash-es';
 import type { CustomerAddress, CartAddressInterface } from '~/modules/GraphQL/types';
 
 export const formatAddressReturnToData = (address: CartAddressInterface) => ({
@@ -53,3 +54,23 @@ export const getInitialCheckoutAddressForm = () : CheckoutAddressForm => ({
   postcode: '',
   telephone: '',
 });
+
+/**
+ * Try to find an address from the user's saved addresses that exactly matches the address that is bound to a cart.
+ *
+ * `useShipping().save()``sends an addressId to Magento to set the shipping address on the cart,
+ * but when you download the cart after that - the cart's endpoint response doesn't contain that addressId, just the address fields (street etc.)
+ * So the only choice left is to try to compare the fields of the addresses.
+ *
+ * This function exists because if a user returns to a cart whose shipping address was set before, we want the user address to be highlighted in the SfAddressPicker component.
+ *
+ * @param customerAddresses The addresses saved in a user's account
+ * @param cartAddress The address that is bound to the cart, @see Cart["billing_address"] Cart["shipping_addresses"]
+ *
+ */
+export const findUserAddressIdenticalToSavedCartAddress = (
+  customerAddresses: CustomerAddress[] | null,
+  cartAddress: CartAddressInterface,
+) : CustomerAddress => customerAddresses?.find(
+  (userAddress) => isEqual(addressFromApiToForm(userAddress), addressFromApiToForm(cartAddress)),
+) ?? null;
diff --git a/packages/theme/modules/checkout/components/UserBillingAddresses.vue b/packages/theme/modules/checkout/components/UserBillingAddresses.vue
index 85d5c72a7..df98164e5 100644
--- a/packages/theme/modules/checkout/components/UserBillingAddresses.vue
+++ b/packages/theme/modules/checkout/components/UserBillingAddresses.vue
@@ -1,9 +1,9 @@
 <template>
   <div>
     <SfAddressPicker
-      :selected="`${selectedAddress}`"
+      :selected="`${currentAddressId}`"
       class="addresses"
-      @change="setCurrentAddress($event)"
+      @change="emitSetCurrentAddress($event)"
     >
       <SfAddress
         v-for="billingAddress in addressesWithCountryName"
@@ -46,8 +46,8 @@ export default defineComponent({
   },
   props: {
     currentAddressId: {
-      type: [String, Number],
-      required: true,
+      type: Number,
+      default: null,
     },
     value: {
       type: Boolean,
@@ -65,21 +65,12 @@ export default defineComponent({
   },
   emits: ['setCurrentAddress'],
   setup(props, { emit }) {
-    const setCurrentAddress = (addressId: string) => {
-      const selectedAddress = props.billingAddresses.find((address) => address.id === Number(addressId));
-      if (!selectedAddress) {
-        return;
+    const emitSetCurrentAddress = (addressId: number) => {
+      const address = props.billingAddresses.find(({ id }) => id === Number(addressId));
+      if (address) {
+        emit('setCurrentAddress', address);
       }
-
-      emit('setCurrentAddress', selectedAddress);
     };
-
-    const selectedAddress = computed(() => (
-      props.currentAddressId
-        ? props.currentAddressId
-        : props.billingAddresses.find((address) => address.default_billing)?.id ?? ''
-    ));
-
     const addressesWithCountryName = computed(() => props.billingAddresses.map((address) => ({
       ...address,
       countryName: props.countries
@@ -89,8 +80,7 @@ export default defineComponent({
     })));
 
     return {
-      selectedAddress,
-      setCurrentAddress,
+      emitSetCurrentAddress,
       addressesWithCountryName,
       userBillingGetters,
     };
diff --git a/packages/theme/modules/checkout/components/UserShippingAddresses.vue b/packages/theme/modules/checkout/components/UserShippingAddresses.vue
index 793412457..0a25420eb 100644
--- a/packages/theme/modules/checkout/components/UserShippingAddresses.vue
+++ b/packages/theme/modules/checkout/components/UserShippingAddresses.vue
@@ -3,7 +3,7 @@
     <SfAddressPicker
       :selected="`${currentAddressId}`"
       class="addresses"
-      @change="setCurrentAddress($event)"
+      @change="emitSetCurrentAddress($event)"
     >
       <SfAddress
         v-for="shippingAddress in addressesWithCountryName"
@@ -49,8 +49,8 @@ export default defineComponent({
   },
   props: {
     currentAddressId: {
-      type: [String, Number],
-      required: true,
+      type: Number,
+      default: null,
     },
     value: {
       type: Boolean,
@@ -68,15 +68,12 @@ export default defineComponent({
   },
   emits: ['setCurrentAddress'],
   setup(props, { emit }) {
-    const setCurrentAddress = (addressId: string | number) => {
-      const selectedAddress = props.shippingAddresses.find((address) => address.id === Number(addressId));
-      if (!selectedAddress) {
-        return;
+    const emitSetCurrentAddress = (addressId: number) => {
+      const address = props.shippingAddresses.find(({ id }) => id === Number(addressId));
+      if (address) {
+        emit('setCurrentAddress', address);
       }
-
-      emit('setCurrentAddress', selectedAddress);
     };
-
     const addressesWithCountryName = computed(() => props.shippingAddresses.map((address) => ({
       ...address,
       countryName: props.countries
@@ -86,7 +83,7 @@ export default defineComponent({
     })));
 
     return {
-      setCurrentAddress,
+      emitSetCurrentAddress,
       addressesWithCountryName,
       userShippingGetters,
     };
diff --git a/packages/theme/modules/checkout/pages/Checkout/Billing.vue b/packages/theme/modules/checkout/pages/Checkout/Billing.vue
index 69816ca91..2b1bbebca 100644
--- a/packages/theme/modules/checkout/pages/Checkout/Billing.vue
+++ b/packages/theme/modules/checkout/pages/Checkout/Billing.vue
@@ -13,7 +13,7 @@
         :label="$t('My billing and shipping address are the same')"
         name="copyShippingAddress"
         class="form__element"
-        @change="handleCheckSameAddress"
+        @change="handleCheckSameAddress($event)"
       />
       <div
         v-if="sameAsShipping"
@@ -26,7 +26,11 @@
                 ...billingDetails,
                 region: { region_code: billingDetails.region },
               }"
-            />
+            >
+              <template #country>
+                {{ shippingDetailsCountryName }}
+              </template>
+            </UserAddressDetails>
           </div>
         </div>
       </div>
@@ -34,13 +38,13 @@
         v-if="!sameAsShipping && isAuthenticated && hasSavedBillingAddress"
         v-model="setAsDefault"
         v-e2e="'billing-addresses'"
-        :current-address-id="currentAddressId || NOT_SELECTED_ADDRESS"
+        :current-address-id="currentAddressId"
         :billing-addresses="addresses"
         :countries="countries"
-        @setCurrentAddress="handleSetCurrentAddress"
+        @setCurrentAddress="handleSetCurrentAddress($event)"
       />
       <div
-        v-if="!sameAsShipping && canAddNewAddress"
+        v-if="!sameAsShipping && isAddNewAddressFormVisible"
         class="form"
       >
         <ValidationProvider
@@ -58,7 +62,7 @@
             required
             :valid="!errors[0]"
             :error-message="$t(errors[0])"
-            @input="(firstname) => changeBillingDetails('firstname', firstname)"
+            @input="changeBillingDetails('firstname', $event)"
           />
         </ValidationProvider>
         <ValidationProvider
@@ -76,7 +80,7 @@
             required
             :valid="!errors[0]"
             :error-message="$t(errors[0])"
-            @input="(lastname) => changeBillingDetails('lastname', lastname)"
+            @input="changeBillingDetails('lastname', $event)"
           />
         </ValidationProvider>
         <ValidationProvider
@@ -94,7 +98,7 @@
             required
             :valid="!errors[0]"
             :error-message="$t(errors[0])"
-            @input="(street) => changeBillingDetails('street', street)"
+            @input="changeBillingDetails('street', $event)"
           />
         </ValidationProvider>
         <ValidationProvider
@@ -112,7 +116,7 @@
             required
             :valid="!errors[0]"
             :error-message="$t(errors[0])"
-            @input="(apartment) => changeBillingDetails('apartment', apartment)"
+            @input="changeBillingDetails('apartment', $event)"
           />
         </ValidationProvider>
         <ValidationProvider
@@ -130,7 +134,7 @@
             required
             :valid="!errors[0]"
             :error-message="$t(errors[0])"
-            @input="(city) => changeBillingDetails('city', city)"
+            @input="changeBillingDetails('city', $event)"
           />
         </ValidationProvider>
         <ValidationProvider
@@ -152,7 +156,7 @@
             :disabled="!billingDetails.country_code"
             name="state"
             class="form__element form__element--half form__element--half-even"
-            @input="(region) => changeBillingDetails('region', region)"
+            @input="changeBillingDetails('region', $event)"
           />
           <SfSelect
             v-else
@@ -164,8 +168,9 @@
             :valid="!errors[0]"
             :error-message="$t(errors[0])"
             class="form__element form__element--half form__element--half-even form__select sf-select--underlined"
-            @input="(state) => changeBillingDetails('region', state)"
+            @input="changeBillingDetails('region', $event)"
           >
+            <SfSelectOption :value="''" />
             <SfSelectOption
               v-for="regionOption in regionInformation"
               :key="regionOption.id"
@@ -217,7 +222,7 @@
             required
             :valid="!errors[0]"
             :error-message="$t(errors[0])"
-            @input="(postcode) => changeBillingDetails('postcode', postcode)"
+            @input="changeBillingDetails('postcode', $event)"
           />
         </ValidationProvider>
         <ValidationProvider
@@ -235,12 +240,12 @@
             required
             :valid="!errors[0]"
             :error-message="$t(errors[0])"
-            @input="(telephone) => changeBillingDetails('telephone', telephone)"
+            @input="changeBillingDetails('telephone', $event)"
           />
         </ValidationProvider>
       </div>
       <SfButton
-        v-if="!sameAsShipping && !canAddNewAddress"
+        v-if="!sameAsShipping && !isAddNewAddressFormVisible"
         class="color-light form__action-button form__action-button--add-address"
         type="submit"
         @click="handleAddNewAddressBtnClick"
@@ -283,16 +288,14 @@ import {
   ref,
   computed,
   onMounted,
-  watch,
   useRouter,
   defineComponent,
   useContext,
 } from '@nuxtjs/composition-api';
 import userBillingGetters from '~/modules/customer/getters/userBillingGetters';
 import addressGetter from '~/modules/customer/getters/addressGetter';
-import {
-  useCountrySearch,
-} from '~/composables';
+import { useCountrySearch } from '~/composables';
+
 import useShipping from '~/modules/checkout/composables/useShipping';
 import useBilling from '~/modules/checkout/composables/useBilling';
 import { useUser } from '~/modules/customer/composables/useUser';
@@ -301,6 +304,7 @@ import UserAddressDetails from '~/components/UserAddressDetails.vue';
 import {
   addressFromApiToForm,
   CheckoutAddressForm,
+  findUserAddressIdenticalToSavedCartAddress,
   formatAddressReturnToData,
   getInitialCheckoutAddressForm,
 } from '~/helpers/checkout/address';
@@ -308,11 +312,9 @@ import { mergeItem } from '~/helpers/asyncLocalStorage';
 import { isPreviousStepValid } from '~/helpers/checkout/steps';
 
 import type {
-  ShippingCartAddress, BillingCartAddress, Country, Customer, CustomerAddress,
+  ShippingCartAddress, Country, Customer, CustomerAddress,
 } from '~/modules/GraphQL/types';
 
-const NOT_SELECTED_ADDRESS = 0;
-
 extend('required', {
   ...required,
   message: 'This field is required',
@@ -343,7 +345,6 @@ export default defineComponent({
     const router = useRouter();
     const { app } = useContext();
     const shippingDetails = ref<ShippingCartAddress | null>(null);
-    const billingAddress = ref<BillingCartAddress | null>(null);
     const userBilling = ref<Customer | null>(null);
 
     const {
@@ -363,24 +364,25 @@ export default defineComponent({
 
     const countries = ref<Country[]>([]);
     const country = ref<Country | null>(null);
+
+    const shippingDetailsCountryName = computed(() => countries
+      .value
+      .find((countryItem) => countryItem.id === shippingDetails.value?.country.code)?.full_name_locale ?? '');
+
     const { isAuthenticated } = useUser();
     let oldBilling : CheckoutAddressForm | null = null;
     const sameAsShipping = ref(false);
-    const billingDetails = ref<CheckoutAddressForm>(
-      billingAddress.value
-        ? addressFromApiToForm(billingAddress.value)
-        : getInitialCheckoutAddressForm(),
-    );
-    const currentAddressId = ref<number>(NOT_SELECTED_ADDRESS);
+    const billingDetails = ref<CheckoutAddressForm>(getInitialCheckoutAddressForm());
+
+    const currentAddressId = ref<number | null>(null);
     const setAsDefault = ref(false);
     const isFormSubmitted = ref(false);
-    const canAddNewAddress = ref(true);
+    const isAddNewAddressFormVisible = ref(true);
 
     const isBillingDetailsStepCompleted = ref(false);
     const addresses = computed(() => (userBilling.value ? userBillingGetters.getAddresses(userBilling.value) : []));
 
     const canMoveForward = computed(() => !loading.value && billingDetails.value && Object.keys(
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       billingDetails.value,
     ).length > 0);
 
@@ -391,7 +393,6 @@ export default defineComponent({
       return addresses.value.length > 0;
     });
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
     const countriesList = computed(() => addressGetter.countriesList(countries.value));
     const regionInformation = computed(() => addressGetter.regionList(country.value));
 
@@ -400,12 +401,12 @@ export default defineComponent({
       const billingDetailsData = {
         billingDetails: {
           ...billingDetails.value,
-          customerAddressId: String(addressId),
+          customerAddressId: addressId === null ? null : String(addressId),
           sameAsShipping: sameAsShipping.value,
         },
       };
       await save(billingDetailsData);
-      if (addressId !== NOT_SELECTED_ADDRESS && setAsDefault.value) {
+      if (addressId !== null && setAsDefault.value) {
         const [chosenAddress] = userBillingGetters.getAddresses(
           userBilling.value,
           { id: addressId },
@@ -418,20 +419,20 @@ export default defineComponent({
       }
       reset();
       await mergeItem('checkout', { billing: billingDetailsData });
-      await router.push(`${app.localePath('/checkout/payment')}`);
+      await router.push(app.localeRoute({ name: 'payment' }));
       isBillingDetailsStepCompleted.value = true;
     };
 
-    const handleCheckSameAddress = async () => {
-      sameAsShipping.value = !sameAsShipping.value;
-      if (sameAsShipping.value) {
+    const handleCheckSameAddress = async (value: boolean) => {
+      sameAsShipping.value = value;
+      if (value) {
         shippingDetails.value = await loadShipping();
-        country.value = await searchCountry({ id: (shippingDetails.value as ShippingCartAddress).country.code });
+        country.value = await searchCountry({ id: (shippingDetails.value).country.code });
         oldBilling = { ...billingDetails.value };
         billingDetails.value = {
           ...formatAddressReturnToData(shippingDetails.value),
         };
-        currentAddressId.value = NOT_SELECTED_ADDRESS;
+        currentAddressId.value = null;
         setAsDefault.value = false;
         if (billingDetails.value.country_code) {
           country.value = await searchCountry({ id: billingDetails?.value.country_code });
@@ -445,88 +446,68 @@ export default defineComponent({
     };
 
     const handleAddNewAddressBtnClick = () => {
-      currentAddressId.value = NOT_SELECTED_ADDRESS;
+      currentAddressId.value = null;
       billingDetails.value = getInitialCheckoutAddressForm();
-      canAddNewAddress.value = true;
+      isAddNewAddressFormVisible.value = true;
       isBillingDetailsStepCompleted.value = false;
     };
 
-    const handleSetCurrentAddress = (addr: CustomerAddress) => {
-      billingDetails.value = { ...addressFromApiToForm(addr) };
-      currentAddressId.value = addr?.id;
-      canAddNewAddress.value = false;
+    const handleSetCurrentAddress = async (customerAddress: CustomerAddress) => {
+      const id = customerAddress?.id;
+      currentAddressId.value = id;
+      if (id) {
+        isAddNewAddressFormVisible.value = false;
+      }
+      billingDetails.value = addressFromApiToForm(customerAddress);
+      country.value = customerAddress.country_code ? await searchCountry({ id: customerAddress.country_code }) : null;
       isBillingDetailsStepCompleted.value = false;
     };
 
-    const changeBillingDetails = (field: string, value: unknown) => {
-      billingDetails.value = {
-        ...billingDetails.value,
-        [field]: value,
-      };
+    const changeBillingDetails = (field: keyof CheckoutAddressForm, value: string) => {
+      billingDetails.value[field] = value;
+      currentAddressId.value = null;
       isBillingDetailsStepCompleted.value = false;
-      currentAddressId.value = NOT_SELECTED_ADDRESS;
-    };
-
-    const selectDefaultAddress = () => {
-      const defaultAddress = userBillingGetters.getAddresses(
-        userBilling.value,
-        { default_billing: true },
-      );
-      if (defaultAddress && defaultAddress.length > 0) {
-        handleSetCurrentAddress(defaultAddress[0]);
-      }
     };
 
     const changeCountry = async (id: string) => {
       changeBillingDetails('country_code', id);
-      country.value = await searchCountry({ id });
+      const newCountry = await searchCountry({ id });
+      billingDetails.value.region = '';
+      country.value = newCountry;
     };
 
-    watch(billingAddress, async (addr) => {
-      billingDetails.value = addr ? addressFromApiToForm(addr) : getInitialCheckoutAddressForm();
-      country.value = await searchCountry({ id: billingDetails.value.country_code });
-    });
-
-    watch(country, (data) => {
-      if (!data?.available_regions) {
-        billingDetails.value.region = '';
-      }
-    });
-
     onMounted(async () => {
-      const validStep = await isPreviousStepValid('shipping');
+      const validStep = await isPreviousStepValid('user-account');
       if (!validStep) {
-        await router.push(app.localePath('/checkout/user-account'));
-      }
-
-      const [loadedCountries, loadedBilling] = await Promise.all([loadCountries(), loadBilling()]);
-      countries.value = loadedCountries;
-      billingAddress.value = loadedBilling;
-
-      if (billingDetails.value?.country_code) {
-        country.value = await searchCountry({ id: billingDetails.value.country_code });
+        await router.push(app.localeRoute({ name: 'user-account' }));
       }
+      const [loadedBillingInfoBoundToCart, loadedUserBilling, loadedCountries] = await Promise.all([
+        loadBilling(),
+        loadUserBilling(),
+        loadCountries(),
+      ]);
+
+      const [defaultAddress = null] = userBillingGetters.getAddresses(loadedUserBilling, { default_shipping: true });
+      const wasBillingAddressAlreadySetOnCart = Boolean(loadedBillingInfoBoundToCart);
+
+      // keep in mind default billing address is set on a customer's cart during cart creation
+      if (wasBillingAddressAlreadySetOnCart) {
+        const userAddressIdenticalToSavedCartAddress = findUserAddressIdenticalToSavedCartAddress(
+          loadedUserBilling?.addresses,
+          loadedBillingInfoBoundToCart,
+        );
 
-      if (!(userBilling.value as Customer)?.addresses && isAuthenticated.value) {
-        userBilling.value = await loadUserBilling();
-      }
-      const billingAddresses = userBilling.value ? userBillingGetters.getAddresses(userBilling.value) : [];
-
-      if (!billingAddresses || billingAddresses.length === 0) {
-        return;
+        handleSetCurrentAddress({ ...loadedBillingInfoBoundToCart, id: userAddressIdenticalToSavedCartAddress?.id });
+      } else if (defaultAddress) {
+        handleSetCurrentAddress(defaultAddress);
       }
 
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-      const hasEmptyBillingDetails = !billingDetails.value || Object.keys(billingDetails.value).length === 0;
-      if (hasEmptyBillingDetails) {
-        selectDefaultAddress();
-        return;
-      }
-      canAddNewAddress.value = false;
+      userBilling.value = loadedUserBilling;
+      countries.value = loadedCountries;
     });
 
     return {
-      canAddNewAddress,
+      isAddNewAddressFormVisible,
       canMoveForward,
       changeCountry,
       changeBillingDetails,
@@ -543,12 +524,12 @@ export default defineComponent({
       isFormSubmitted,
       isBillingDetailsStepCompleted,
       loading,
-      NOT_SELECTED_ADDRESS,
       regionInformation,
       searchCountry,
       setAsDefault,
       billingDetails,
       sameAsShipping,
+      shippingDetailsCountryName,
       addresses,
     };
   },
diff --git a/packages/theme/modules/checkout/pages/Checkout/Shipping.vue b/packages/theme/modules/checkout/pages/Checkout/Shipping.vue
index 4577d6bd8..063461131 100644
--- a/packages/theme/modules/checkout/pages/Checkout/Shipping.vue
+++ b/packages/theme/modules/checkout/pages/Checkout/Shipping.vue
@@ -10,15 +10,15 @@
     <form @submit.prevent="handleSubmit(handleAddressSubmit(reset))">
       <UserShippingAddresses
         v-if="isAuthenticated && hasSavedShippingAddress"
-        v-model="setAsDefault"
+        v-model="isSetAsDefaultRequested"
         v-e2e="'shipping-addresses'"
-        :current-address-id="currentAddressId || NOT_SELECTED_ADDRESS"
+        :current-address-id="currentAddressId"
         :shipping-addresses="addresses"
         :countries="countries"
-        @setCurrentAddress="handleSetCurrentAddress"
+        @setCurrentAddress="handleSetCurrentAddress($event)"
       />
       <div
-        v-if="canAddNewAddress"
+        v-if="isAddNewAddressFormVisible"
         class="form"
       >
         <ValidationProvider
@@ -36,9 +36,7 @@
             required
             :valid="!errors[0]"
             :error-message="$t(errors[0])"
-            @input="
-              (firstname) => changeShippingDetails('firstname', firstname)
-            "
+            @input=" changeShippingDetails('firstname', $event)"
           />
         </ValidationProvider>
         <ValidationProvider
@@ -56,7 +54,7 @@
             required
             :valid="!errors[0]"
             :error-message="$t(errors[0])"
-            @input="(lastname) => changeShippingDetails('lastname', lastname)"
+            @input="changeShippingDetails('lastname', $event)"
           />
         </ValidationProvider>
         <ValidationProvider
@@ -74,7 +72,7 @@
             required
             :valid="!errors[0]"
             :error-message="$t(errors[0])"
-            @input="(street) => changeShippingDetails('street', street)"
+            @input="changeShippingDetails('street', $event)"
           />
         </ValidationProvider>
         <ValidationProvider
@@ -92,9 +90,7 @@
             required
             :valid="!errors[0]"
             :error-message="$t(errors[0])"
-            @input="
-              (apartment) => changeShippingDetails('apartment', apartment)
-            "
+            @input="changeShippingDetails('apartment', $event) "
           />
         </ValidationProvider>
         <ValidationProvider
@@ -112,7 +108,7 @@
             required
             :valid="!errors[0]"
             :error-message="$t(errors[0])"
-            @input="(city) => changeShippingDetails('city', city)"
+            @input="changeShippingDetails('city', $event)"
           />
         </ValidationProvider>
         <ValidationProvider
@@ -141,7 +137,7 @@
                 ? $t('Please select a country first')
                 : ''
             "
-            @input="(region) => changeShippingDetails('region', region)"
+            @input="changeShippingDetails('region', $event)"
           />
           <SfSelect
             v-else
@@ -152,8 +148,9 @@
             class="form__element form__element--half form__element--half-even form__select sf-select--underlined"
             :valid="!errors[0]"
             :error-message="$t(errors[0])"
-            @input="(region) => changeShippingDetails('region', region)"
+            @input="changeShippingDetails('region', $event)"
           >
+            <SfSelectOption :value="''" />
             <SfSelectOption
               v-for="regionOption in regionInformation"
               :key="regionOption.id"
@@ -180,6 +177,7 @@
             :error-message="$t(errors[0])"
             @input="changeCountry"
           >
+            <SfSelectOption :value="''" />
             <SfSelectOption
               v-for="countryOption in countriesList"
               :key="countryOption.id"
@@ -204,7 +202,7 @@
             required
             :valid="!errors[0]"
             :error-message="$t(errors[0])"
-            @input="(postcode) => changeShippingDetails('postcode', postcode)"
+            @input="changeShippingDetails('postcode', $event)"
           />
         </ValidationProvider>
         <ValidationProvider
@@ -222,14 +220,12 @@
             required
             :valid="!errors[0]"
             :error-message="$t(errors[0])"
-            @input="
-              (telephone) => changeShippingDetails('telephone', telephone)
-            "
+            @input="changeShippingDetails('telephone', $event)"
           />
         </ValidationProvider>
       </div>
       <SfButton
-        v-if="!canAddNewAddress"
+        v-if="!isAddNewAddressFormVisible"
         class="color-light form__action-button form__action-button--add-address"
         type="submit"
         @click="handleAddNewAddressBtnClick"
@@ -252,7 +248,7 @@
       <VsfShippingProvider
         v-if="isShippingDetailsStepCompleted && !dirty"
         :shipping-methods="shippingMethods"
-        @submit="$router.push(`${localePath('/checkout/billing')}`)"
+        @submit="$router.push(localeRoute({ name: 'billing' }))"
       />
     </form>
   </ValidationObserver>
@@ -265,7 +261,6 @@ import {
 import {
   ref,
   computed,
-  watch,
   onMounted,
   defineComponent,
   useRouter,
@@ -275,21 +270,19 @@ import { required, min, digits } from 'vee-validate/dist/rules';
 import { ValidationProvider, ValidationObserver, extend } from 'vee-validate';
 import userShippingGetters from '~/modules/customer/getters/userShippingGetters';
 import addressGetter from '~/modules/customer/getters/addressGetter';
-import {
-  useCountrySearch,
-} from '~/composables';
+import { useCountrySearch } from '~/composables';
 import type {
-  Country, AvailableShippingMethod, ShippingCartAddress, CustomerAddress, Customer,
+  Country, AvailableShippingMethod, CustomerAddress, Customer,
 } from '~/modules/GraphQL/types';
 import useShipping from '~/modules/checkout/composables/useShipping';
 import useUser from '~/modules/customer/composables/useUser';
 import useUserAddress from '~/modules/customer/composables/useUserAddress';
-import { addressFromApiToForm, CheckoutAddressForm, getInitialCheckoutAddressForm } from '~/helpers/checkout/address';
+import {
+  addressFromApiToForm, CheckoutAddressForm, findUserAddressIdenticalToSavedCartAddress, getInitialCheckoutAddressForm,
+} from '~/helpers/checkout/address';
 import { mergeItem } from '~/helpers/asyncLocalStorage';
 import { isPreviousStepValid } from '~/helpers/checkout/steps';
 
-const NOT_SELECTED_ADDRESS = 0;
-
 extend('required', {
   ...required,
   message: 'This field is required',
@@ -318,7 +311,6 @@ export default defineComponent({
   setup() {
     const router = useRouter();
     const { app } = useContext();
-    const address = ref<ShippingCartAddress | null>(null);
     const userShipping = ref<Customer | null>(null);
     const {
       load: loadShipping,
@@ -337,12 +329,13 @@ export default defineComponent({
     const countries = ref<Country[]>([]);
     const country = ref<Country | null>(null);
     const { isAuthenticated } = useUser();
-    const shippingDetails = ref<CheckoutAddressForm>(address.value ? addressFromApiToForm(address.value) : getInitialCheckoutAddressForm());
+    const shippingDetails = ref<CheckoutAddressForm>(getInitialCheckoutAddressForm());
     const shippingMethods = ref<AvailableShippingMethod[]>([]);
-    const currentAddressId = ref<number>(NOT_SELECTED_ADDRESS);
-    const setAsDefault = ref(false);
+    const currentAddressId = ref<number | null>(null);
+
+    const isSetAsDefaultRequested = ref(false);
     const isFormSubmitted = ref(false);
-    const canAddNewAddress = ref(true);
+    const isAddNewAddressFormVisible = ref(true);
 
     const isShippingDetailsStepCompleted = ref(false);
     const addresses = computed(() => userShippingGetters.getAddresses(userShipping.value));
@@ -373,12 +366,12 @@ export default defineComponent({
       const shippingInfo = await saveShipping({ shippingDetails: shippingDetailsData });
       shippingMethods.value = shippingInfo?.available_shipping_methods ?? [];
 
-      if (addressId !== NOT_SELECTED_ADDRESS && setAsDefault.value) {
+      if (addressId !== null && isSetAsDefaultRequested.value) {
         const [chosenAddress] = userShippingGetters.getAddresses(
           userShipping.value,
           { id: addressId },
         );
-        chosenAddress.default_shipping = setAsDefault.value;
+        chosenAddress.default_shipping = isSetAsDefaultRequested.value;
         if (chosenAddress) {
           await setDefaultAddress({ address: chosenAddress });
           userShipping.value = await loadUserShipping(true);
@@ -389,90 +382,65 @@ export default defineComponent({
     };
 
     const handleAddNewAddressBtnClick = () => {
-      currentAddressId.value = NOT_SELECTED_ADDRESS;
+      currentAddressId.value = null;
       shippingDetails.value = getInitialCheckoutAddressForm();
-      canAddNewAddress.value = true;
+      isAddNewAddressFormVisible.value = true;
       isShippingDetailsStepCompleted.value = false;
     };
 
-    const handleSetCurrentAddress = (addr: CustomerAddress) => {
-      shippingDetails.value = { ...addressFromApiToForm(addr) };
-      currentAddressId.value = addr?.id;
-      canAddNewAddress.value = false;
+    const handleSetCurrentAddress = async (customerAddress: CustomerAddress) => {
+      const id = customerAddress?.id;
+      currentAddressId.value = id;
+      if (id) {
+        isAddNewAddressFormVisible.value = false;
+      }
+      shippingDetails.value = addressFromApiToForm(customerAddress);
+      country.value = customerAddress.country_code ? await searchCountry({ id: customerAddress.country_code }) : null;
       isShippingDetailsStepCompleted.value = false;
     };
 
-    const changeShippingDetails = (field: string, value: unknown) => {
-      shippingDetails.value = {
-        ...shippingDetails.value,
-        [field]: value,
-      };
+    const changeShippingDetails = (field: keyof CheckoutAddressForm, value: string) => {
+      shippingDetails.value[field] = value;
       isShippingDetailsStepCompleted.value = false;
-      currentAddressId.value = NOT_SELECTED_ADDRESS;
-    };
-
-    const selectDefaultAddress = () => {
-      const defaultAddress = userShippingGetters.getAddresses(
-        userShipping.value,
-        { default_shipping: true },
-      ) as [CustomerAddress] | [];
-      if (defaultAddress && defaultAddress.length > 0) {
-        handleSetCurrentAddress(defaultAddress[0]);
-      }
+      currentAddressId.value = null;
     };
 
     const changeCountry = async (id: string) => {
       changeShippingDetails('country_code', id);
-      country.value = await searchCountry({ id });
+      const newCountry = await searchCountry({ id });
+      shippingDetails.value.region = '';
+      country.value = newCountry;
     };
 
-    watch(address, async (addr) => {
-      shippingDetails.value = addr ? addressFromApiToForm(addr) : getInitialCheckoutAddressForm();
-      country.value = await searchCountry({ id: shippingDetails.value.country_code });
-    });
-
-    watch(country, (data) => {
-      if (!data?.available_regions) {
-        shippingDetails.value.region = '';
-      }
-    });
-
     onMounted(async () => {
       const validStep = await isPreviousStepValid('user-account');
       if (!validStep) {
-        await router.push(app.localePath('/checkout/user-account'));
+        await router.push(app.localeRoute({ name: 'user-account' }));
       }
-      const [loadedShippingInfo, loadedUserShipping, loadedCountries] = await Promise.all([
+      const [loadedShippingInfoBoundToCart, loadedUserShipping, loadedCountries] = await Promise.all([
         loadShipping(),
         loadUserShipping(),
         loadCountries(),
       ]);
 
-      address.value = loadedShippingInfo;
-      userShipping.value = loadedUserShipping;
-      countries.value = loadedCountries;
-
-      if (shippingDetails.value?.country_code) {
-        country.value = await searchCountry({ id: shippingDetails.value.country_code });
-      }
-
-      const shippingAddresses = userShippingGetters.getAddresses(
-        userShipping.value,
-      );
-
-      if (!shippingAddresses || shippingAddresses.length === 0) {
-        return;
-      }
+      const [defaultAddress = null] = userShippingGetters.getAddresses(loadedUserShipping, { default_shipping: true });
+      const wasShippingAddressAlreadySetOnCart = Boolean(loadedShippingInfoBoundToCart);
 
-      const hasEmptyShippingDetails = !shippingDetails.value
-        || Object.keys(shippingDetails.value).length === 0;
-      if (hasEmptyShippingDetails) {
-        selectDefaultAddress();
+      if (wasShippingAddressAlreadySetOnCart) {
+        const userAddressIdenticalToSavedCartAddress = findUserAddressIdenticalToSavedCartAddress(
+          loadedUserShipping?.addresses,
+          loadedShippingInfoBoundToCart,
+        );
+        handleSetCurrentAddress({ ...loadedShippingInfoBoundToCart, id: userAddressIdenticalToSavedCartAddress?.id });
+      } else if (defaultAddress) {
+        handleSetCurrentAddress(defaultAddress);
       }
+      userShipping.value = loadedUserShipping;
+      countries.value = loadedCountries;
     });
 
     return {
-      canAddNewAddress,
+      isAddNewAddressFormVisible,
       canMoveForward,
       changeCountry,
       changeShippingDetails,
@@ -488,10 +456,9 @@ export default defineComponent({
       isFormSubmitted,
       isShippingDetailsStepCompleted,
       isShippingLoading,
-      NOT_SELECTED_ADDRESS,
       regionInformation,
       searchCountry,
-      setAsDefault,
+      isSetAsDefaultRequested,
       shippingDetails,
       shippingMethods,
       addresses,
diff --git a/packages/theme/modules/customer/getters/userBillingGetters.ts b/packages/theme/modules/customer/getters/userBillingGetters.ts
index 53cf3caf9..309058cfb 100644
--- a/packages/theme/modules/customer/getters/userBillingGetters.ts
+++ b/packages/theme/modules/customer/getters/userBillingGetters.ts
@@ -4,6 +4,8 @@ import { TransformedCustomerAddress } from '../composables/types';
 
 const userBillingGetters: UserBillingGetters<Customer, CustomerAddress, TransformedCustomerAddress> = {
   getAddresses: (billing, criteria?: Record<string, any>) => {
+    if (!billing || !billing.addresses) return [] as CustomerAddress[];
+
     if (!criteria || Object.keys(criteria).length === 0) {
       return billing.addresses;
     }