diff --git a/classes/Cart.php b/classes/Cart.php
index 250654629..c40296c81 100644
--- a/classes/Cart.php
+++ b/classes/Cart.php
@@ -3012,7 +3012,7 @@ class CartCore extends ObjectModel
 				)';
 				Db::getInstance()->execute($sql);
 
-		// upgradng address delivery
+		// Upgrading address delivery
 		$sql = 'UPDATE `'._DB_PREFIX_.'cart_product`
 			SET `id_address_delivery` =
 			(
diff --git a/controllers/front/OrderOpcController.php b/controllers/front/OrderOpcController.php
index 0e2baa77d..aac8c7b46 100644
--- a/controllers/front/OrderOpcController.php
+++ b/controllers/front/OrderOpcController.php
@@ -189,6 +189,9 @@ class OrderOpcControllerCore extends ParentOrderController
 									$this->context->cart->id_address_invoice = Tools::isSubmit('same') ? $this->context->cart->id_address_delivery : (int)(Tools::getValue('id_address_invoice'));
 									if (!$this->context->cart->update())
 										$this->errors[] = Tools::displayError('An error occurred while updating your cart.');
+									
+									if (!$this->context->cart->isMultiAddressDelivery())
+										$this->context->cart->setNoMultishipping(); // As the cart is no multishipping, set each delivery address lines with the main delivery address
 
 									if (!count($this->errors))
 									{