diff --git a/addons/stock/models/stock_picking.py b/addons/stock/models/stock_picking.py
index 9a00c2660d4..3e3e99c931e 100644
--- a/addons/stock/models/stock_picking.py
+++ b/addons/stock/models/stock_picking.py
@@ -784,8 +784,9 @@ class Picking(models.Model):
         else:
             moves = self.env['stock.move'].browse(move_ids)
             if self.env.context.get('no_state_change'):
-                moves = moves.filtered(lambda m: m.reserved_quant_ids)
-            moves.do_unreserve()
+                moves.filtered(lambda m: m.reserved_quant_ids).do_unreserve()
+            else:
+                moves.do_unreserve()
             moves.action_assign(no_prepare=True)
 
     @api.multi