diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 95f7d141..a186aaa6 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -1398,7 +1398,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
             $old_rider = $obj->getRider();
             if ($old_rider != null)
             {
-                if ($old_rider->getCurrentJobOrder() != null)
+                if (($old_rider->getCurrentJobOrder() != null) &&
+                    ($old_rider->getCurrentJobOrder()->getID() == $obj->getID()))
                 {
                     $old_rider->setCurrentJobOrder();
                     // set available flag for first rider
@@ -1660,7 +1661,8 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
             $old_rider = $obj->getRider();
             if ($old_rider != null)
             {
-                if ($old_rider->getCurrentJobOrder() != null)
+                if (($old_rider->getCurrentJobOrder() != null) &&
+                    ($old_rider->getCurrentJobOrder()->getID() == $obj->getID()))
                 {
                     $old_rider->setCurrentJobOrder();
                     // set available flag for first rider