diff --git a/web/org.openbravo.retail.posterminal/js/components/businesspartner_selector.js b/web/org.openbravo.retail.posterminal/js/components/businesspartner_selector.js
--- a/web/org.openbravo.retail.posterminal/js/components/businesspartner_selector.js
+++ b/web/org.openbravo.retail.posterminal/js/components/businesspartner_selector.js
@@ -719,7 +719,7 @@
     }
     var me = this;
     OB.Dal.get(OB.Model.BusinessPartner, bpartner.get('bpartnerId'), function (bp) {
-      bp.setBPLocations(shipping, billing);
+      bp.setBPLocations(shipping, billing, OB.MobileApp.model.hasPermission('OBPOS_remote.customer', true));
 
       if (me.target.startsWith('filterSelectorButton_')) {
         me.doChangeFilterSelector({
diff --git a/web/org.openbravo.retail.posterminal/js/model/businesspartner.js b/web/org.openbravo.retail.posterminal/js/model/businesspartner.js
--- a/web/org.openbravo.retail.posterminal/js/model/businesspartner.js
+++ b/web/org.openbravo.retail.posterminal/js/model/businesspartner.js
@@ -229,7 +229,7 @@
         callback(shipping, billing, collection.models);
       });
     },
-    setBPLocations: function (shipping, billing) {
+    setBPLocations: function (shipping, billing, locationModel) {
       if (shipping) {
         this.set('shipLocId', shipping.get('id'));
         this.set('shipLocName', shipping.get('name'));
@@ -248,7 +248,7 @@
         this.set("locId", null);
         this.set("locName", null);
       }
-      if (OB.MobileApp.model.hasPermission('OBPOS_remote.customer', true)) {
+      if (locationModel) {
         this.set('locationModel', shipping);
         if (shipping !== null) {
           this.set('cityName', shipping.get('cityName'));
diff --git a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
--- a/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
+++ b/web/org.openbravo.retail.posterminal/js/pointofsale/model/pointofsale-model.js
@@ -936,7 +936,7 @@
 
         if (dataBps) {
           dataBps.loadBPLocations(null, null, function (shipping, billing, locations) {
-            dataBps.setBPLocations(shipping, billing);
+            dataBps.setBPLocations(shipping, billing, true);
             dataBps.set('locations', locations);
             OB.MobileApp.model.set('businessPartner', dataBps);
             OB.Dal.save(dataBps, function () {}, function () {