diff --git a/addons/stock_picking_batch/models/stock_move_line.py b/addons/stock_picking_batch/models/stock_move_line.py
index 4dbf5414d49..985b45cebb7 100644
--- a/addons/stock_picking_batch/models/stock_move_line.py
+++ b/addons/stock_picking_batch/models/stock_move_line.py
@@ -36,7 +36,8 @@ class StockMoveLine(models.Model):
 
         if not wave:
             wave = self.env['stock.picking.batch'].create({
-                'is_wave': True
+                'is_wave': True,
+                'user_id': self.env.context.get('active_owner_id'),
             })
         line_by_picking = defaultdict(lambda: self.env['stock.move.line'])
         for line in self:
diff --git a/addons/stock_picking_batch/wizard/stock_add_to_wave.py b/addons/stock_picking_batch/wizard/stock_add_to_wave.py
index 889274276cd..73f6fcb7764 100644
--- a/addons/stock_picking_batch/wizard/stock_add_to_wave.py
+++ b/addons/stock_picking_batch/wizard/stock_add_to_wave.py
@@ -37,6 +37,7 @@ class StockPickingToWave(models.TransientModel):
     def attach_pickings(self):
         self.ensure_one()
 
+        self = self.with_context(active_owner_id=self.user_id.id)
         if self.line_ids:
             company = self.line_ids.company_id
             if len(company) > 1: