diff --git a/odoo/addons/base/models/res_partner.py b/odoo/addons/base/models/res_partner.py
index bd3c0ab4489..3e84b921882 100644
--- a/odoo/addons/base/models/res_partner.py
+++ b/odoo/addons/base/models/res_partner.py
@@ -415,6 +415,11 @@ class Partner(models.Model):
         if not self.image and self._context.get('gravatar_image') and self.email:
             self.image = self._get_gravatar_image(self.email)
 
+    @api.onchange('parent_id', 'company_id')
+    def _onchange_company_id(self):
+        if self.parent_id:
+            self.company_id = self.parent_id.company_id.id
+
     @api.depends('name', 'email')
     def _compute_email_formatted(self):
         for partner in self:
diff --git a/odoo/addons/base/views/res_partner_views.xml b/odoo/addons/base/views/res_partner_views.xml
index 2bb056f75b6..5a93c801e9d 100644
--- a/odoo/addons/base/views/res_partner_views.xml
+++ b/odoo/addons/base/views/res_partner_views.xml
@@ -401,7 +401,7 @@
                                 </group>
                                 <group name="misc" string="Misc">
                                     <field name="ref" string="Reference"/>
-                                    <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}"/>
+                                    <field name="company_id" groups="base.group_multi_company" options="{'no_create': True}" attrs="{'readonly': [('parent_id', '!=', False)]}"/>
                                     <field name="industry_id" attrs="{'invisible': [('is_company', '=', False)]}" options="{'no_create': True}"/>
                                 </group>
                             </group>