diff --git a/edi_oca/models/edi_backend.py b/edi_oca/models/edi_backend.py
index 9a017b95b..7c97b7960 100644
--- a/edi_oca/models/edi_backend.py
+++ b/edi_oca/models/edi_backend.py
@@ -52,6 +52,7 @@ class EDIBackend(models.Model):
     """
     )
     active = fields.Boolean(default=True)
+    company_id = fields.Many2one("res.company", string="Company")
 
     def _get_component(self, exchange_record, key):
         record_conf = self._get_component_conf_for_record(exchange_record, key)
diff --git a/edi_oca/security/ir_model_access.xml b/edi_oca/security/ir_model_access.xml
index 6d4ecd49f..0c37acca9 100644
--- a/edi_oca/security/ir_model_access.xml
+++ b/edi_oca/security/ir_model_access.xml
@@ -120,4 +120,11 @@
             name="domain_force"
         >['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
     </record>
+    <record id="rule_edi_backend_multi_company" model="ir.rule">
+        <field name="name">edi_backend multi-company</field>
+        <field name="model_id" ref="model_edi_backend" />
+        <field
+            name="domain_force"
+        >['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
+    </record>
 </odoo>
diff --git a/edi_oca/views/edi_backend_views.xml b/edi_oca/views/edi_backend_views.xml
index 9a837e7d2..d784f9995 100644
--- a/edi_oca/views/edi_backend_views.xml
+++ b/edi_oca/views/edi_backend_views.xml
@@ -6,6 +6,11 @@
             <list decoration-muted="(not active)">
                 <field name="name" />
                 <field name="active" />
+                <field
+                    name="company_id"
+                    groups="base.group_multi_company"
+                    optional="hide"
+                />
             </list>
         </field>
     </record>
@@ -47,6 +52,7 @@
                     <group>
                         <field name="output_sent_processed_auto" />
                         <field name="active" invisible="1" />
+                        <field name="company_id" groups="base.group_multi_company" />
                     </group>
                     <!-- Hook to add more config -->
                     <notebook />
diff --git a/edi_oca/views/edi_exchange_type_views.xml b/edi_oca/views/edi_exchange_type_views.xml
index 7f517f03b..59b7ab69a 100644
--- a/edi_oca/views/edi_exchange_type_views.xml
+++ b/edi_oca/views/edi_exchange_type_views.xml
@@ -67,11 +67,7 @@
                             string="Model rules"
                             groups="edi_oca.group_edi_advanced_settings_manager"
                         >
-                            <!-- <field
-                                name="rule_ids"
-                                context="{'default_type_id': active_id}"
-                            > -->
-                            <field name="rule_ids">
+                            <field name="rule_ids" context="{'default_type_id': id}">
                                 <list decoration-muted="(not active)">
                                     <field name="active" invisible="1" />
                                     <field name="name" />