diff --git a/lib/classes/task/appboxAbstract.class.php b/lib/classes/task/appboxAbstract.class.php
index b80d3fa771..04d5918050 100755
--- a/lib/classes/task/appboxAbstract.class.php
+++ b/lib/classes/task/appboxAbstract.class.php
@@ -84,7 +84,6 @@ abstract class task_appboxAbstract extends task_abstract
                 switch ($process_ret) {
                     case self::STATE_MAXMEGSREACHED:
                     case self::STATE_MAXRECSDONE:
-                    case self::STATE_OK:
                         if ($this->getRunner() == self::RUNNER_SCHEDULER) {
                             $this->setState(self::STATE_TORESTART);
                             $this->running = FALSE;
@@ -104,7 +103,10 @@ abstract class task_appboxAbstract extends task_abstract
             } // if(row)
 
             $this->incrementLoops();
-            $this->pause($duration);
+
+            if ($this->running) {
+                $this->pause($duration);
+            }
         } // while running
 
         return;
diff --git a/lib/classes/task/databoxAbstract.class.php b/lib/classes/task/databoxAbstract.class.php
index 01aee7f427..8986fd7b96 100755
--- a/lib/classes/task/databoxAbstract.class.php
+++ b/lib/classes/task/databoxAbstract.class.php
@@ -111,7 +111,6 @@ abstract class task_databoxAbstract extends task_abstract
                 switch ($process_ret) {
                     case self::STATE_MAXMEGSREACHED:
                     case self::STATE_MAXRECSDONE:
-                    case self::STATE_OK:
                         if ($this->getRunner() == self::RUNNER_SCHEDULER) {
                             $this->setState(self::STATE_TORESTART);
                             $this->running = FALSE;
@@ -133,7 +132,10 @@ abstract class task_databoxAbstract extends task_abstract
             }
 
             $this->incrementLoops();
-            $this->pause($duration);
+
+            if ($this->running) {
+                $this->pause($duration);
+            }
         }
 
         if ($task_must_delete) {