diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py
index 140b8950a54..2ea9f11a437 100644
--- a/addons/mrp/models/mrp_production.py
+++ b/addons/mrp/models/mrp_production.py
@@ -1151,6 +1151,8 @@ class MrpProduction(models.Model):
             production.workorder_ids._action_confirm()
         # run scheduler for moves forecasted to not have enough in stock
         self.move_raw_ids._trigger_scheduler()
+        self.picking_ids.filtered(
+            lambda p: p.state not in ['cancel', 'done']).action_confirm()
         self.state = 'confirmed'
         return True