diff --git a/src/pages/Account/AddressList.vue b/src/pages/Account/AddressList.vue
index 9939c926..50bb7de9 100644
--- a/src/pages/Account/AddressList.vue
+++ b/src/pages/Account/AddressList.vue
@@ -14,7 +14,6 @@ import { storeToRefs } from 'pinia';
 import { useUserStore } from 'stores/user';
 
 const router = useRouter();
-const jApi = inject('jApi');
 const api = inject('api');
 const { notify } = useNotify();
 const { t } = useI18n();
@@ -26,32 +25,30 @@ const fetchAddressesRef = ref(null);
 
 const addresses = ref([]);
 const defaultAddress = ref(null);
-const clientId = ref(null);
 
 const goToAddressDetails = (id = 0) =>
     router.push({ name: 'addressDetails', params: { id } });
 
 const getDefaultAddress = async () => {
     try {
-        const [address] = await jApi.query(
-            'SELECT id, defaultAddressFk FROM myClient c'
-        );
-        defaultAddress.value = address.defaultAddressFk;
-        clientId.value = address.id;
+        const filter = { fields: ['defaultAddressFk'] };
+        const { data } = await api.get(`Clients/${userStore?.userId}`, {
+            params: { filter: JSON.stringify(filter) }
+        });
+        defaultAddress.value = data.defaultAddressFk;
     } catch (error) {
         console.error('Error getting default address:', error);
     }
 };
 
-const changeDefaultAddress = async () => {
-    if (!clientId.value) return;
-    await jApi.execQuery(
-        `UPDATE myClient
-        SET defaultAddressFk = #defaultAddress
-        WHERE id = #id;`,
+const changeDefaultAddress = async address => {
+    if (!userStore?.userId) return;
+
+    await api.patch(
+        `/Clients/${userStore?.user?.id}/updateAddress/${address.id}`,
         {
-            defaultAddress: defaultAddress.value,
-            id: clientId.value
+            ...address,
+            defaultAddressFk: defaultAddress.value
         }
     );
     notify(t('defaultAddressModified'), 'positive');
@@ -129,7 +126,7 @@ onMounted(async () => {
                         v-model="defaultAddress"
                         :val="address.id"
                         class="q-mr-sm"
-                        @update:model-value="changeDefaultAddress"
+                        @update:model-value="changeDefaultAddress(address)"
                     />
                 </template>
                 <template #content>
diff --git a/src/stores/user.js b/src/stores/user.js
index 8f170752..8b75f124 100644
--- a/src/stores/user.js
+++ b/src/stores/user.js
@@ -296,6 +296,8 @@ export const useUserStore = defineStore('user', () => {
         tokenConfig.value = null;
     };
 
+    const userId = computed(() => user.value?.id);
+
     watch(
         [mainUser, supplantedUser],
         () => (user.value = supplantedUser.value || mainUser.value),
@@ -336,6 +338,7 @@ export const useUserStore = defineStore('user', () => {
         updateUserLang,
         init,
         $reset,
-        onLogin
+        onLogin,
+        userId
     };
 });