diff --git a/app/code/Magento/Checkout/Model/Session.php b/app/code/Magento/Checkout/Model/Session.php
index 573c8ac149845..c42f5a906d2cb 100644
--- a/app/code/Magento/Checkout/Model/Session.php
+++ b/app/code/Magento/Checkout/Model/Session.php
@@ -416,6 +416,8 @@ public function clearQuote()
$this->_quote = null;
$this->setQuoteId(null);
$this->setLastSuccessQuoteId(null);
+ $this->setLoadInactive(false);
+ $this->replaceQuote($this->getQuote()->save());
return $this;
}
diff --git a/app/code/Magento/Checkout/view/frontend/templates/success.phtml b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
index 5ef7e992c4e9c..9229538e9c8e7 100644
--- a/app/code/Magento/Checkout/view/frontend/templates/success.phtml
+++ b/app/code/Magento/Checkout/view/frontend/templates/success.phtml
@@ -25,4 +25,13 @@
+