diff --git a/shipment.py b/shipment.py
index e86932d6be..9067c3167f 100644
--- a/shipment.py
+++ b/shipment.py
@@ -112,7 +112,7 @@ class ShipmentAssignMixin(ShipmentMixin):
                         ('state', '=', 'assigned'),
                         ('assignation_required', '=', True),
                         ]),
-                ('state', '!=', 'assigned'),
+                ('state', '=', 'waiting'),
                 ]
         else:
             return []