diff --git a/modules/order/front/basic-data/index.html b/modules/order/front/basic-data/index.html
index 46c7394856..109168e29d 100644
--- a/modules/order/front/basic-data/index.html
+++ b/modules/order/front/basic-data/index.html
@@ -23,7 +23,6 @@
                 show-field="name"
                 value-field="id"
                 ng-model="$ctrl.order.clientFk"
-                on-change="$ctrl.getAvailableAgencies()"
                 selection="$ctrl.selection"
                 fields="['defaultAddressFk']">
                 <tpl-item>{{::id}}: {{::name}}</tpl-item>
@@ -36,7 +35,8 @@
                 search-function="$search"
                 show-field="nickname"
                 value-field="id"
-                ng-model="$ctrl.order.addressFk">
+                ng-model="$ctrl.order.addressFk"
+                on-change="$ctrl.getAvailableAgencies()">
                 <tpl-item>{{::nickname}}</tpl-item>
             </vn-autocomplete>
         </vn-horizontal>
@@ -48,7 +48,7 @@
                 on-change="$ctrl.getAvailableAgencies()">
             </vn-date-picker>
             <vn-autocomplete
-                disabled="!$ctrl.order.clientFk || !$ctrl.order.landed"
+                disabled="!$ctrl.order.addressFk || !$ctrl.order.landed"
                 data="$ctrl._availableAgencies"
                 label="Agency"
                 show-field="agencyMode"
diff --git a/modules/order/front/basic-data/index.spec.js b/modules/order/front/basic-data/index.spec.js
index f55c2c07f4..01009d0850 100644
--- a/modules/order/front/basic-data/index.spec.js
+++ b/modules/order/front/basic-data/index.spec.js
@@ -45,7 +45,7 @@ describe('Order', () => {
         describe('getAvailableAgencies()', () => {
             it('should set agencyModeFk to null and get the available agencies if the order has landed and client', async() => {
                 controller.order.agencyModeFk = 999;
-                controller.order.clientFk = 999;
+                controller.order.addressFk = 999;
                 controller.order.landed = new Date();
 
                 const expectedAgencies = [{id: 1}, {id: 2}];