diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index a066bf91407..091275e32ea 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -181,6 +181,12 @@ watch(
 );
 
 async function onClientSelected({ clientFk }, formData = {}) {
+    if (!clientFk) {
+        addressOptions.value = [];
+        formData.defaultAddressFk = null;
+        formData.addressId = null;
+        return;
+    }
     const { data } = await getAddresses(clientFk);
     addressOptions.value = data;
     formData.defaultAddressFk = data[0].client.defaultAddressFk;
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index cca1b8a1d59..b2e13fcb60c 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -266,7 +266,12 @@ const onClientSelected = async (formData) => {
 };
 
 const fetchAddresses = async (formData) => {
-    if (!formData.clientId) return;
+    if (!formData.clientId) {
+        addressesOptions.value = [];
+        formData.defaultAddressFk = null;
+        formData.addressId = null;
+        return;
+    }
     const { data } = await getAddresses(formData.clientId);
     formInitialData.value = { clientId: formData.clientId };
     if (!data) return;