diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 1316bcfd5..13f2a8a94 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -8,7 +8,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -277,8 +276,6 @@ async function getZone(options) {
             <VnSelect
                 :label="t('ticketList.client')"
                 v-model="clientId"
-                option-value="id"
-                option-label="name"
                 url="Clients"
                 :fields="['id', 'name']"
                 sort-by="id"
@@ -328,7 +325,10 @@ async function getZone(options) {
                     >
                         <QItemSection style="min-width: min-content" avatar>
                             <QIcon
-                                v-if="scope.opt.isActive && addressId === scope.opt.id"
+                                v-if="
+                                    scope.opt.isActive &&
+                                    formData.client.defaultAddressFk === scope.opt.id
+                                "
                                 size="sm"
                                 color="grey"
                                 name="star"
diff --git a/src/pages/Ticket/Card/TicketFilter.js b/src/pages/Ticket/Card/TicketFilter.js
index daa204a7a..0f12e98a3 100644
--- a/src/pages/Ticket/Card/TicketFilter.js
+++ b/src/pages/Ticket/Card/TicketFilter.js
@@ -20,6 +20,7 @@ export default {
                     'isFreezed',
                     'isTaxDataChecked',
                     'hasElectronicInvoice',
+                    'defaultAddressFk',
                     'credit',
                 ],
                 include: [