diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index cb59d7c4a..ced3b9b30 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -149,7 +149,12 @@ onMounted(() => {
 });
 async function fetchClientAddress(id, formData = {}) {
     const { data } = await axios.get(`Clients/${id}`, {
-        params: { filter: { include: { relation: 'addresses' } } },
+        params: {
+            filter: {
+                order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
+                include: { relation: 'addresses' },
+            },
+        },
     });
     addressesList.value = data.addresses;
     formData.addressId = data.defaultAddressFk;
@@ -191,7 +196,7 @@ const getDateColor = (date) => {
             urlCreate: 'Orders/new',
             title: t('module.cerateOrder'),
             onDataSaved: (url) => {
-               tableRef.redirect(`${url}/catalog`);
+                tableRef.redirect(`${url}/catalog`);
             },
             formInitialData: {
                 active: true,
@@ -253,22 +258,27 @@ const getDateColor = (date) => {
                 @update:model-value="() => fetchAgencies(data)"
             >
                 <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
+                    <QItem
+                        v-bind="scope.itemProps"
+                        :class="{ disabled: !scope.opt.isActive }"
+                    >
+                        <QItemSection style="min-width: min-content" avatar>
+                            <QIcon
+                                v-if="
+                                    scope.opt.isActive && data.addressId === scope.opt.id
+                                "
+                                size="sm"
+                                color="grey"
+                                name="star"
+                                class="fill-icon"
+                            />
+                        </QItemSection>
                         <QItemSection>
-                            <QItemLabel
-                                :class="{
-                                    'color-vn-label': !scope.opt?.isActive,
-                                }"
-                            >
-                                {{
-                                    `${
-                                        !scope.opt?.isActive
-                                            ? t('basicData.inactive')
-                                            : ''
-                                    } `
-                                }}
-                                {{ scope.opt?.nickname }}: {{ scope.opt?.street }},
-                                {{ scope.opt?.city }}
+                            <QItemLabel>
+                                {{ scope.opt.nickname }}
+                            </QItemLabel>
+                            <QItemLabel caption>
+                                {{ `${scope.opt.street}, ${scope.opt.city}` }}
                             </QItemLabel>
                         </QItemSection>
                     </QItem>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index bcb39f527..6f6c556ca 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -273,7 +273,7 @@ const fetchAddresses = async (formData) => {
 
     const filter = {
         fields: ['nickname', 'street', 'city', 'id', 'isActive'],
-        order: 'nickname ASC',
+        order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
     };
     const params = { filter: JSON.stringify(filter) };
     const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, {
@@ -646,7 +646,22 @@ function setReference(data) {
                     @update:model-value="() => fetchAvailableAgencies(data)"
                 >
                     <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
+                        <QItem
+                            v-bind="scope.itemProps"
+                            :class="{ disabled: !scope.opt.isActive }"
+                        >
+                            <QItemSection style="min-width: min-content" avatar>
+                                <QIcon
+                                    v-if="
+                                        scope.opt.isActive &&
+                                        selectedClient?.defaultAddressFk === scope.opt.id
+                                    "
+                                    size="sm"
+                                    color="grey"
+                                    name="star"
+                                    class="fill-icon"
+                                />
+                            </QItemSection>
                             <QItemSection>
                                 <QItemLabel
                                     :class="{