diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
index c78b04d7f..4b16e4c7b 100644
--- a/src/pages/Order/Card/OrderCreateDialog.vue
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -59,17 +59,17 @@ const initialFormState = reactive({
     clientFk: $props.clientFk,
 });
 
-const onClientChange = async (clientId = $props.clientFk) => {
-    const { data } = await axios.get(`Clients/${clientId}`);
-    await fetchAddressList(data.defaultAddressFk);
-};
+// const onClientChange = async (clientId = $props.clientFk) => {
+//     const { data } = await axios.get(`Clients/${clientId}`);
+//     await fetchAddressList(data.defaultAddressFk);
+// };
 
 async function onDataSaved(_, id) {
     await router.push({ path: `/order/${id}/catalog` });
 }
-onMounted(async () => {
-    await onClientChange();
-});
+// onMounted(async () => {
+//     await onClientChange();
+// });
 </script>
 
 <template>
@@ -90,10 +90,9 @@ onMounted(async () => {
                     option-value="id"
                     option-label="name"
                     :filter="{
-                        fields: ['id', 'name', 'defaultAddressFk'],
+                        fields: ['id', 'name'],
                     }"
                     hide-selected
-                    @update:model-value="onClientChange"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
@@ -110,7 +109,7 @@ onMounted(async () => {
                     :label="t('order.form.addressFk')"
                     v-model="data.addressId"
                     url="addresses"
-                    :fields="['id', 'nickname', 'defaultAddressFk', 'street', 'city']"
+                    :fields="['id', 'nickname', 'street', 'city']"
                     sort-by="id"
                     option-value="id"
                     option-label="street"
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index cb59d7c4a..20fd3aafa 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -141,12 +141,6 @@ const columns = computed(() => [
         ],
     },
 ]);
-onMounted(() => {
-    if (!route.query.createForm) return;
-    const clientId = route.query.createForm;
-    const id = JSON.parse(clientId);
-    fetchClientAddress(id.clientFk);
-});
 async function fetchClientAddress(id, formData = {}) {
     const { data } = await axios.get(`Clients/${id}`, {
         params: { filter: { include: { relation: 'addresses' } } },
@@ -191,7 +185,7 @@ const getDateColor = (date) => {
             urlCreate: 'Orders/new',
             title: t('module.cerateOrder'),
             onDataSaved: (url) => {
-               tableRef.redirect(`${url}/catalog`);
+                tableRef.redirect(`${url}/catalog`);
             },
             formInitialData: {
                 active: true,
@@ -250,7 +244,7 @@ const getDateColor = (date) => {
                 :label="t('module.address')"
                 option-value="id"
                 option-label="nickname"
-                @update:model-value="() => fetchAgencies(data)"
+                @update:model-value="() => fetchClientAddress(data)"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">