diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 30fa965f..34c48a2b 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -432,7 +432,8 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         }
         else
         {
-            $old_rider = $jo->getRider();
+            //$old_rider = $jo->getRider();
+            $old_jo_status = $jo->getStatus();
         }
 
         // check if lat and lng are provided
@@ -668,8 +669,10 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                 $em->flush();
 
                 // check if JO has been reassigned
-                if ($old_rider != $rider)
+                //if ($old_rider != $rider)
+                if ($old_jo_status != $jo->getStatus())
                 {
+                    //error_log('JO has been reassigned');
                     // TODO: refactor later
                     $channel = 'rider/' . $rider->getID() . '/events';
                     $payload = [