diff --git a/htdocs/expedition/card.php b/htdocs/expedition/card.php
index 3286f97002e..6dbcc538397 100644
--- a/htdocs/expedition/card.php
+++ b/htdocs/expedition/card.php
@@ -317,7 +317,7 @@ if (empty($reshook)) {
 
 		//var_dump($batch_line[2]);
 
-		if ($totalqty > 0 && !empty($conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS)) {		// There is at least one thing to ship
+		if ($totalqty > 0 || !empty($conf->global->SHIPMENT_GETS_ALL_ORDER_PRODUCTS)) {		// There is at least one thing to ship
 			//var_dump($_POST);exit;
 			for ($i = 0; $i < $num; $i++) {
 				$qty = "qtyl".$i;