diff --git a/composer.json b/composer.json
index 0f17d3c94c..13e39b3978 100644
--- a/composer.json
+++ b/composer.json
@@ -101,7 +101,7 @@
     "payum/payum-bundle": "^2.5",
     "php-http/guzzle7-adapter": "^1.0",
     "php-http/message-factory": "^1.0",
-    "pimcore/pimcore": "~10.6.1",
+    "pimcore/pimcore": "^10.5",
     "rinvex/countries": "^7.3",
     "sebastian/diff": "^4.0 | ^5.0",
     "stof/doctrine-extensions-bundle": "^1.6",
@@ -160,7 +160,7 @@
     "symfony-tests-dir": "tests",
     "symfony-assets-install": "relative",
     "branch-alias": {
-      "dev-master": "3.1-dev"
+      "dev-master": "3.0-dev"
     }
   },
   "config": {
diff --git a/src/CoreShop/Component/Order/Modifier/VoucherModifier.php b/src/CoreShop/Component/Order/Modifier/VoucherModifier.php
index bd40ddb3a7..32cae385e5 100644
--- a/src/CoreShop/Component/Order/Modifier/VoucherModifier.php
+++ b/src/CoreShop/Component/Order/Modifier/VoucherModifier.php
@@ -77,6 +77,10 @@ public function decrement(OrderInterface $order): void
                 continue;
             }
 
+            if (!$item->getVoucherCode()) {
+                continue;
+            }
+
             $voucherCode = $this->voucherCodeRepository->findByCode($item->getVoucherCode());
             if ($voucherCode instanceof CartPriceRuleVoucherCodeInterface) {
                 if ($voucherCode->getUses() !== 0) {