diff --git a/CHANGELOG.md b/CHANGELOG.md
index 438d2984aba..f1cf898123b 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@
 
 This project does not follow a versioning standard. Versions are crafted after the dates; for example, the version 17.7.25 was released on July, 25th in 2017
 
+## 18.6.8
+
+### Fixed
+- An issue which resulted in basked requests always being performed in sandbox mode.
+
 ## 18.6.7
 
 ### Fixed
diff --git a/Helper/BasketHelper.php b/Helper/BasketHelper.php
index e0c9484a985..909ac5326a4 100755
--- a/Helper/BasketHelper.php
+++ b/Helper/BasketHelper.php
@@ -154,6 +154,9 @@ public function submitQuoteToBasketApi(Quote $quote = null)
             $this->mainConfig->getSecuritySender()
         );
 
+        // set sandboxmode according to configured mode
+        $basketApiRequest->setIsSandboxMode($this->mainConfig->isSandboxModeActive());
+
         // add a new basket via api request by sending the addNewBasket request
         $basketApiResponse = $basketApiRequest->addNewBasket();
 
diff --git a/etc/module.xml b/etc/module.xml
index 17d2c5f8059..aeec89dd788 100755
--- a/etc/module.xml
+++ b/etc/module.xml
@@ -1,5 +1,5 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../lib/internal/Magento/Framework/Module/etc/module.xsd">
-    <module name="Heidelpay_Gateway" schema_version="18.6.7" setup_version="18.6.7">
+    <module name="Heidelpay_Gateway" schema_version="18.6.8" setup_version="18.6.8">
         <sequence>
             <module name="Magento_Sales" />
             <module name="Magento_Payment" />