diff --git a/addons/mrp_subcontracting/models/res_partner.py b/addons/mrp_subcontracting/models/res_partner.py
index 7c46acb5072..e2aa3f1278f 100644
--- a/addons/mrp_subcontracting/models/res_partner.py
+++ b/addons/mrp_subcontracting/models/res_partner.py
@@ -9,7 +9,6 @@ class ResPartner(models.Model):
 
     property_stock_subcontractor = fields.Many2one(
         'stock.location', string="Subcontractor Location", company_dependent=True,
-        domain="[('is_subcontracting_location', '=', True)]",
         help="The stock location used as source and destination when sending\
         goods to this contact during a subcontracting process.")
     is_subcontractor = fields.Boolean(
diff --git a/addons/mrp_subcontracting/models/stock_location.py b/addons/mrp_subcontracting/models/stock_location.py
index 9f75af10f3b..9130cf0e026 100644
--- a/addons/mrp_subcontracting/models/stock_location.py
+++ b/addons/mrp_subcontracting/models/stock_location.py
@@ -23,12 +23,6 @@ class StockLocation(models.Model):
             if location.is_subcontracting_location and (location.usage != 'internal' or location.warehouse_id):
                 raise ValidationError(_("In order to manage stock accurately, subcontracting locations must be type Internal, linked to the appropriate company and not specific to a warehouse."))
 
-    @api.constrains('is_subcontracting_location')
-    def _check_is_subcontracting_location(self):
-        for location in self:
-            if not location.is_subcontracting_location and location.subcontractor_ids:
-                raise ValidationError(_("You cannot change the subcontracting location as it is still linked to a subcontractor partner"))
-
     @api.model_create_multi
     def create(self, vals_list):
         res = super().create(vals_list)
diff --git a/addons/mrp_subcontracting/views/res_partner_views.xml b/addons/mrp_subcontracting/views/res_partner_views.xml
index d947a95a9dc..4576141003b 100644
--- a/addons/mrp_subcontracting/views/res_partner_views.xml
+++ b/addons/mrp_subcontracting/views/res_partner_views.xml
@@ -6,7 +6,7 @@
         <field name="inherit_id" ref="stock.view_partner_stock_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='property_stock_supplier']" position="after">
-                <field name="property_stock_subcontractor" context="{'default_is_subcontracting_location': True}"/>
+                <field name="property_stock_subcontractor"/>
                 <separator/>
             </xpath>
         </field>
diff --git a/addons/mrp_subcontracting/views/stock_location_views.xml b/addons/mrp_subcontracting/views/stock_location_views.xml
index aa3d9a9100c..c0cc743d437 100644
--- a/addons/mrp_subcontracting/views/stock_location_views.xml
+++ b/addons/mrp_subcontracting/views/stock_location_views.xml
@@ -6,7 +6,7 @@
         <field name="inherit_id" ref="stock.view_location_form"/>
         <field name="arch" type="xml">
             <xpath expr="//field[@name='return_location']" position='after'>
-                <field name="is_subcontracting_location" groups="base.group_no_one" attrs="{'invisible': [('usage', '!=', 'internal')]}" readonly="context.get('default_is_subcontracting_location', False)"/>
+                <field name="is_subcontracting_location" groups="base.group_no_one" attrs="{'invisible': [('usage', '!=', 'internal')]}"/>
             </xpath>
         </field>
     </record>