diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
index d41ebc8f..597869c4 100644
--- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
@@ -840,6 +840,9 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
         // set jo status to in transit
         $jo->setStatus(JOStatus::IN_TRANSIT);
 
+        // set rider's active JO
+        
+
         // TODO: send mqtt event (?)
 
         // add event log
@@ -1940,7 +1943,17 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
             return $data;
         }
 
-        $jo_data = $this->formatJobOrderData($req, $jo);
+        $jo_data = [];
+        // check if JO status is in_progress, in_transit, performed, paid
+        switch($jo->getStatus())
+        {
+            case JOStatus::IN_TRANSIT:
+            case JOStatus::IN_PROGRESS:
+            case JOStatus::PERFORMED:
+            case JOStatus::PAID:
+                $jo_data = $this->formatJobOrderData($req, $jo);
+                break;
+        }
 
         $data = [
             'job_order' => $jo_data