diff --git a/classes/Cart.php b/classes/Cart.php
index 52126f604..e10cb4834 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -2958,12 +2958,8 @@ class CartCore extends ObjectModel
 			return false;
 
 		foreach ($this->getProducts() as $product)
-
-			if (!$product['active']
-				|| (
-					!$product['allow_oosp'] && $product['stock_quantity'] < $product['cart_quantity']
-				)
-				|| !$product['available_for_order'])
+			if (!$product['active'] || !$product['available_for_order']
+				|| (!$product['allow_oosp'] && $product['stock_quantity'] < $product['cart_quantity']))
 				return false;
 
 		return true;
diff --git a/classes/CartRule.php b/classes/CartRule.php
index 837d28f40..e32bd3451 100644
--- a/classes/CartRule.php
+++ b/classes/CartRule.php
@@ -530,14 +530,21 @@ class CartRuleCore extends ObjectModel
 				return (!$display_error) ? false : Tools::displayError('You have not reached the minimum amount required to use this voucher');
 		}
 		
-		// Check if the voucher is already in the cart of if a non compatible voucher is in the cart
-		// Important note: this MUST be the last check, because if the tested cart rule has priority over a non combinable one in the cart, we will switch them
+		/* This loop checks:
+			- if the voucher is already in the cart
+			- if a non compatible voucher is in the cart
+			- if there are products in the cart (gifts excluded)
+			Important note: this MUST be the last check, because if the tested cart rule has priority over a non combinable one in the cart, we will switch them
+		*/
+		$nb_products = Cart::getNbProducts($context->cart->id);
 		$otherCartRules = $context->cart->getCartRules();
 		if (count($otherCartRules))
 			foreach ($otherCartRules as $otherCartRule)
 			{
 				if ($otherCartRule['id_cart_rule'] == $this->id && !$alreadyInCart)
 					return (!$display_error) ? false : Tools::displayError('This voucher is already in your cart');
+				if ($otherCartRule['gift_product'])
+					--$nb_products;
 				if ($this->cart_rule_restriction && $otherCartRule['cart_rule_restriction'] && $otherCartRule['id_cart_rule'] != $this->id)
 				{
 					$combinable = Db::getInstance()->getValue('
@@ -558,6 +565,9 @@ class CartRuleCore extends ObjectModel
 				}
 			}
 		
+		if (!$nb_products)
+			return (!$display_error) ? false : Tools::displayError('Cart is empty');
+		
 		if (!$display_error)
 			return true;
 	}