diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 2eec81db1..ff7c46802 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -159,9 +159,10 @@ onMounted(async () => {
         const query = JSON.parse(route.query?.createForm);
         formInitialData.value = query;
         await onClientSelected({ ...formInitialData.value, clientId: query?.clientFk });
-    } else {
+    } else if (route.query?.table) {
         const query = JSON.parse(route.query?.table);
-        await onClientSelected({ clientId: query?.clientFk });
+        const clientId = query?.clientFk;
+        if (clientId) await onClientSelected({ clientId });
     }
     if (tableRef.value) tableRef.value.create.formInitialData = formInitialData.value;
 });
@@ -171,7 +172,7 @@ watch(
     async (newValue) => {
         if (newValue) {
             const clientId = +JSON.parse(newValue)?.clientFk;
-            await onClientSelected({ clientId });
+            if (clientId) await onClientSelected({ clientId });
             if (tableRef.value)
                 tableRef.value.create.formInitialData = formInitialData.value;
         }
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 1e9414f54..0fce4a08f 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -263,15 +263,8 @@ const columns = computed(() => [
 ]);
 const onClientSelected = async (formData) => {
     resetAgenciesSelector(formData);
-    // await fetchClient(formData);
     await fetchAddresses(formData);
 };
-const fetchClient = async (formData) => {
-    const response = await getClient(formData.clientId);
-    if (!response) return;
-    const [client] = response.data;
-    selectedClient.value = client;
-};
 
 const fetchAddresses = async (formData) => {
     const { data } = await getAddresses(formData.clientId);