diff --git a/addons/mrp/models/mrp_production.py b/addons/mrp/models/mrp_production.py
index cd399d60f67..3b66e1def7c 100644
--- a/addons/mrp/models/mrp_production.py
+++ b/addons/mrp/models/mrp_production.py
@@ -216,8 +216,9 @@ class MrpProduction(models.Model):
             if order.bom_id.ready_to_produce == 'all_available':
                 order.availability = any(move.state not in ('assigned', 'done', 'cancel') for move in order.move_raw_ids) and 'waiting' or 'assigned'
             else:
-                partial_list = [x.state in ('partially_available', 'assigned') for x in order.move_raw_ids]
-                assigned_list = [x.state in ('assigned', 'done', 'cancel') for x in order.move_raw_ids]
+                move_raw_ids = order.move_raw_ids.filtered(lambda m: m.product_qty)
+                partial_list = [x.state in ('partially_available', 'assigned') for x in move_raw_ids]
+                assigned_list = [x.state in ('assigned', 'done', 'cancel') for x in move_raw_ids]
                 order.availability = (all(assigned_list) and 'assigned') or (any(partial_list) and 'partially_available') or 'waiting'
 
     @api.depends('move_raw_ids', 'is_locked', 'state', 'move_raw_ids.quantity_done')