diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 3fb316194db..5ee5baff1b9 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -824,6 +824,12 @@ class Picking(models.Model):
             picking.package_level_ids.filtered(lambda p: not p.move_ids).unlink()
 
     def button_validate(self):
+        # Clean-up the context key at validation to avoid forcing the creation of immediate
+        # transfers.
+        ctx = dict(self.env.context)
+        ctx.pop('default_immediate_transfer', None)
+        self = self.with_context(ctx)
+
         # Sanity checks.
         pickings_without_moves = self.browse()
         pickings_without_quantities = self.browse()