diff --git a/Block/Checkout/Success.php b/Block/Checkout/Success.php
new file mode 100644
index 000000000..3a4bf6896
--- /dev/null
+++ b/Block/Checkout/Success.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Bolt magento2 plugin
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ *
+ * @category   Bolt
+ * @package    Bolt_Boltpay
+ * @copyright  Copyright (c) 2018 Bolt Financial, Inc (https://www.bolt.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+namespace Bolt\Boltpay\Block\Checkout;
+
+use Magento\Framework\View\Element\Template;
+use Magento\Framework\View\Element\Template\Context;
+use Magento\Framework\App\ProductMetadataInterface;
+
+/**
+ * Class Success
+ *
+ * @package Bolt\Boltpay\Block\Checkout
+ */
+class Success extends Template
+{
+    /**
+     * @var ProductMetadataInterface
+     */
+    private $productMetadata;
+
+    /**
+     * Success constructor.
+     *
+     * @param ProductMetadataInterface $productMetadata
+     * @param Context                  $context
+     * @param array                    $data
+     */
+    public function __construct(
+        ProductMetadataInterface $productMetadata,
+        Context $context,
+        array $data = []
+    ){
+        parent::__construct($context, $data);
+
+        $this->productMetadata = $productMetadata;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isAllowInvalidateQuote()
+    {
+        // Workaround for known magento issue - https://github.com/magento/magento2/issues/12504
+        return (bool) (version_compare($this->getMagentoVersion(), '2.2.0', '<'));
+    }
+
+    /**
+     * Get magento version
+     *
+     * @return string
+     */
+    private function getMagentoVersion()
+    {
+        return $this->productMetadata->getVersion();
+    }
+}
diff --git a/Plugin/ClearQuote.php b/Plugin/ClearQuote.php
new file mode 100644
index 000000000..007162ac0
--- /dev/null
+++ b/Plugin/ClearQuote.php
@@ -0,0 +1,41 @@
+<?php
+/**
+ * Bolt magento2 plugin
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Open Software License (OSL 3.0)
+ * that is bundled with this package in the file LICENSE.txt.
+ * It is also available through the world-wide-web at this URL:
+ * http://opensource.org/licenses/osl-3.0.php
+ *
+ * @category   Bolt
+ * @package    Bolt_Boltpay
+ * @copyright  Copyright (c) 2018 Bolt Financial, Inc (https://www.bolt.com)
+ * @license    http://opensource.org/licenses/osl-3.0.php  Open Software License (OSL 3.0)
+ */
+namespace Bolt\Boltpay\Plugin;
+
+use Magento\Checkout\Model\Session as CheckoutSession;
+
+/**
+ * Class ClearQuote
+ *
+ * @package Bolt\Boltpay\Plugin
+ */
+class ClearQuote
+{
+    /**
+     * @param CheckoutSession $subject
+     * @return CheckoutSession
+     * @throws \Exception
+     */
+    public function afterClearQuote(CheckoutSession $subject)
+    {
+         // Workaround for known magento issue - https://github.com/magento/magento2/issues/12504
+        $subject->setLoadInactive(false);
+        $subject->replaceQuote($subject->getQuote()->save());
+
+        return $subject;
+    }
+}
diff --git a/etc/frontend/di.xml b/etc/frontend/di.xml
index fa234a887..eb42629e0 100644
--- a/etc/frontend/di.xml
+++ b/etc/frontend/di.xml
@@ -32,4 +32,7 @@
             <argument name="checkoutSession" xsi:type="object">Magento\Checkout\Model\Session</argument>
         </arguments>
     </type>
+    <type name="Magento\Checkout\Model\Session">
+        <plugin name="BoltClearQuoteAfterOrderCompletion" type="Bolt\Boltpay\Plugin\ClearQuote" />
+    </type>
 </config>
diff --git a/view/frontend/layout/checkout_onepage_success.xml b/view/frontend/layout/checkout_onepage_success.xml
new file mode 100644
index 000000000..4dd5d15dd
--- /dev/null
+++ b/view/frontend/layout/checkout_onepage_success.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2013-2017 Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="content">
+            <block class="Bolt\Boltpay\Block\Checkout\Success" name="bolt.success.page" template="Bolt_Boltpay::checkout/success.phtml" after="-" />
+        </referenceBlock>
+    </body>
+</page>
diff --git a/view/frontend/templates/checkout/success.phtml b/view/frontend/templates/checkout/success.phtml
new file mode 100644
index 000000000..5c82b82eb
--- /dev/null
+++ b/view/frontend/templates/checkout/success.phtml
@@ -0,0 +1,11 @@
+<?php /* @var $block Bolt\Boltpay\Block\Checkout\Success */ ?>
+<?php if ($block->isAllowInvalidateQuote()): ?>
+<script>
+    require([
+        'Magento_Customer/js/customer-data'
+    ], function (customerData) {
+        var sections = ['cart'];
+        customerData.invalidate(sections);
+    });
+</script>
+<?php endif; ?>