diff --git a/rma/models/stock_move.py b/rma/models/stock_move.py
index f3077f0b..e7bf862a 100644
--- a/rma/models/stock_move.py
+++ b/rma/models/stock_move.py
@@ -8,7 +8,7 @@ class StockMove(models.Model):
     _inherit = "stock.move"
 
     rma_line_id = fields.Many2one(
-        "rma.order.line", string="RMA line", ondelete="restrict"
+        "rma.order.line", string="RMA line", ondelete="restrict", index="btree_not_null"
     )
 
     @api.model_create_multi
diff --git a/rma/views/rma_order_line_view.xml b/rma/views/rma_order_line_view.xml
index 887f541d..e899ab89 100644
--- a/rma/views/rma_order_line_view.xml
+++ b/rma/views/rma_order_line_view.xml
@@ -236,7 +236,7 @@
                             <field
                             name="reference_move_id"
                             options="{'no_create': True}"
-                            domain="[('picking_id.partner_id', '=', partner_id),
+                            domain="[('picking_id.partner_id', 'child_of', partner_id),
                                             ('location_dest_id.usage', '=', 'customer'),
                                             ('state', '=', 'done')]"
                             readonly="state not in ['draft']"
@@ -400,7 +400,7 @@
                 <field name="reference_move_id" position="attributes">
                     <attribute
                     name="domain"
-                >[('picking_id.partner_id', '=', partner_id),
+                >[('picking_id.partner_id', 'child_of', partner_id),
                                     ('location_id.usage', '=', 'supplier'),
                                     ('state', '=', 'done')]</attribute>
                 </field>