diff --git a/src/pages/Route/Agency/composables/getAgencies.js b/src/pages/Route/Agency/composables/getAgencies.js
index 180ac943e..8c6266768 100644
--- a/src/pages/Route/Agency/composables/getAgencies.js
+++ b/src/pages/Route/Agency/composables/getAgencies.js
@@ -21,9 +21,7 @@ export async function getAgencies(formData, client, _filter = {}) {
     });
 
     if (options && client) {
-        agency = options.find(
-            ({ agencyModeFk }) => agencyModeFk === client.defaultAddress.agencyModeFk,
-        );
+        agency = options.find(({ agencyModeFk }) => agencyModeFk === client.agencyModeFk);
     }
 
     return { options, agency };
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 0fce4a08f..ad0e6f15f 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -271,7 +271,7 @@ const fetchAddresses = async (formData) => {
     formInitialData.value = { clientId: formData.clientId };
     if (!data) return;
     addressesOptions.value = data;
-    selectedClient.value = data[0].client;
+    selectedClient.value = { ...data[0].client, agencyModeFk: data[0].agencyModeFk };
     formData.addressId = selectedClient.value.defaultAddressFk;
     formInitialData.value.addressId = formData.addressId;
 };