diff --git a/client/client/src/address-edit/address-edit.html b/client/client/src/address-edit/address-edit.html
index afc77305b..d94324c92 100644
--- a/client/client/src/address-edit/address-edit.html
+++ b/client/client/src/address-edit/address-edit.html
@@ -36,7 +36,7 @@
             </vn-horizontal>
             <vn-horizontal>
                 <vn-autocomplete vn-one
-                    initial-data="$ctrl.address.defaultAgencyFk"
+                    initial-data="$ctrl.address.defaultAgency"
                     field="$ctrl.address.defaultAgencyFk"
                     url="/client/api/AgencyModes"
                     show-field="name"
diff --git a/services/client/common/models/address.js b/services/client/common/models/address.js
index 6d74933a3..53c0bcbad 100644
--- a/services/client/common/models/address.js
+++ b/services/client/common/models/address.js
@@ -25,12 +25,19 @@ module.exports = function(Self) {
 
     Self.beforeRemote('findById', function(ctx, modelInstance, next) {
         ctx.args.filter = {
-            include: {
+            include: [{
                 relation: "province",
                 scope: {
                     fields: ["id", "name"]
                 }
+            },
+            {
+                relation: "defaultAgency",
+                scope: {
+                    fields: ["id", "name"]
+                }
             }
+            ]
         };
         next();
     });
diff --git a/services/client/common/models/address.json b/services/client/common/models/address.json
index 42ac6d696..937073d16 100644
--- a/services/client/common/models/address.json
+++ b/services/client/common/models/address.json
@@ -58,7 +58,7 @@
     },
     "defaultAgency": {
       "type": "belongsTo",
-      "model": "Agency",
+      "model": "AgencyMode",
       "foreignKey": "defaultAgencyFk"
     }
   }