diff --git a/controllers/front/OrderController.php b/controllers/front/OrderController.php
index 123745ca9..40b901788 100644
--- a/controllers/front/OrderController.php
+++ b/controllers/front/OrderController.php
@@ -150,12 +150,16 @@ class OrderControllerCore extends ParentOrderController
 					Tools::redirect('index.php?controller=order&step=2');
 
 				// Check the delivery option is setted
-				if (!Tools::getValue('delivery_option') && !$this->context->cart->isVirtualCart())
+				if (!$this->context->cart->isVirtualCart())
 				{
-					Tools::redirect('index.php?controller=order&step=2');
-					foreach (Tools::getValue('delivery_option') as $delivery_option)
-					if (empty($delivery_option))
+					if (!Tools::getValue('delivery_option'))
 						Tools::redirect('index.php?controller=order&step=2');
+					else
+					{
+						foreach (Tools::getValue('delivery_option') as $delivery_option)
+						if (empty($delivery_option))
+							Tools::redirect('index.php?controller=order&step=2');
+					}
 				}
 
 				$this->autoStep();