diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 928b609d..95f7d141 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -1398,9 +1398,12 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
             $old_rider = $obj->getRider();
             if ($old_rider != null)
             {
-                $old_rider->setCurrentJobOrder();
-                // set available flag for first rider
-                $old_rider->setAvailable(true);
+                if ($old_rider->getCurrentJobOrder() != null)
+                {
+                    $old_rider->setCurrentJobOrder();
+                    // set available flag for first rider
+                    $old_rider->setAvailable(true);
+                }
             }
 
             // coordinates
@@ -1657,9 +1660,12 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
             $old_rider = $obj->getRider();
             if ($old_rider != null)
             {
-                $old_rider->setCurrentJobOrder();
-                // set available flag for first rider
-                $old_rider->setAvailable(true);
+                if ($old_rider->getCurrentJobOrder() != null)
+                {
+                    $old_rider->setCurrentJobOrder();
+                    // set available flag for first rider
+                    $old_rider->setAvailable(true); 
+                }
             }
 
             // coordinates