diff --git a/model/execution/Counter/DeliveryExecutionCounterService.php b/model/execution/Counter/DeliveryExecutionCounterService.php
index <HASH>..<HASH> 100644
--- a/model/execution/Counter/DeliveryExecutionCounterService.php
+++ b/model/execution/Counter/DeliveryExecutionCounterService.php
@@ -55,14 +55,15 @@ class DeliveryExecutionCounterService extends ConfigurableService implements Del
         $toStatusKey = $this->getStatusKey($event->getState());
         $persistence = $this->getPersistence();
 
-        if ($this->count($event->getPreviousState()) > 0) {
+        if ($persistence->exists($fromStatusKey) && $persistence->get($fromStatusKey) > 0) {
             $persistence->decr($fromStatusKey);
         }
 
-        if ($persistence->get($toStatusKey) === false) {
-            $persistence->set($toStatusKey, 0);
+        if (!$persistence->exists($toStatusKey)) {
+            $persistence->set($toStatusKey, 1);
+        } else {
+            $persistence->incr($toStatusKey);
         }
-        $persistence->incr($toStatusKey);
     }
 
     /**
ckeck existence of key in KV storage in DeliveryExecutionCounterService