diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py
index c35b03869cf..ae6aaa5b306 100644
--- a/addons/mrp/models/mrp_production.py
+++ b/addons/mrp/models/mrp_production.py
@@ -604,6 +604,8 @@ class MrpProduction(models.Model):
 
     @api.onchange('bom_id', 'product_id', 'product_qty', 'product_uom_id')
     def _onchange_move_raw(self):
+        if not self.bom_id and not self._origin.product_id:
+            return
         # Clear move raws if we are changing the product. In case of creation (self._origin is empty),
         # we need to avoid keeping incorrect lines, so clearing is necessary too.
         if self.product_id != self._origin.product_id: