diff --git a/src/Doctrine/EventSubscriber/TaskSubscriber.php b/src/Doctrine/EventSubscriber/TaskSubscriber.php
index de24678802..8100b6fa89 100644
--- a/src/Doctrine/EventSubscriber/TaskSubscriber.php
+++ b/src/Doctrine/EventSubscriber/TaskSubscriber.php
@@ -40,8 +40,7 @@ public function __construct(
         LoggerInterface $logger,
         private Geocoder $geocoder,
         private OrderManager $orderManager
-    )
-    {
+    ) {
         $this->eventBus = $eventBus;
         $this->eventStore = $eventStore;
         $this->processor = $processor;
@@ -155,7 +154,7 @@ public function postFlush(PostFlushEventArgs $args)
      * @param array $tasksToUpdate
      * @param \SplObjectStorage $createdAddresses
      */
-    private function handleAddressesChangesForTasks(/* UnitOfWork */ $uow, array $tasksToUpdate, \SplObjectStorage $createdAddresses)
+    private function handleAddressesChangesForTasks(/* UnitOfWork */$uow, array $tasksToUpdate, \SplObjectStorage $createdAddresses)
     {
         $isAddress = function ($entity) {
             return $entity instanceof Address;
@@ -186,11 +185,8 @@ private function handleAddressesChangesForTasks(/* UnitOfWork */ $uow, array $ta
                             ];
                         }
                     }
-
                 }
-
             }
-
         }
     }
 
@@ -210,7 +206,7 @@ private function handleStateChangesForTasks(EntitymanagerInterface $em, array $t
                 continue;
             }
 
-            [ $oldValue, $newValue ] = $changeset['status'];
+            [$oldValue, $newValue] = $changeset['status'];
 
             if ($newValue === Task::STATUS_CANCELLED) {
 
@@ -233,7 +229,7 @@ private function handleStateChangesForTasks(EntitymanagerInterface $em, array $t
                     }
                 }
 
-                if ($cancelOrder && $order->getState() !== OrderInterface::STATE_CANCELLED) {
+                if ($cancelOrder && $order->getState() !== OrderInterface::STATE_CANCELLED && $order->getState() !== OrderInterface::STATE_REFUSED) {
                     $this->orderManager->cancel($order, 'All tasks were cancelled');
                     $em->flush();
                 }