diff --git a/src/Controller/CAPI/RiderAppController.php b/src/Controller/CAPI/RiderAppController.php
index a42c39c9..a984e405 100644
--- a/src/Controller/CAPI/RiderAppController.php
+++ b/src/Controller/CAPI/RiderAppController.php
@@ -389,7 +389,7 @@ class RiderAppController extends APIController
 
     }
 
-    public function acceptJobOrder(Request $req, EntityManagerInterface $em, MQTTClientApiv2 $mclientv2)
+    public function acceptJobOrder(Request $req, EntityManagerInterface $em)
     {
         $required_params = ['jo_id'];
 
@@ -412,14 +412,6 @@ class RiderAppController extends APIController
         // set jo status to in transit
         $jo->setStatus(JOStatus::IN_TRANSIT);
 
-        // NOTE: send new in transit event to new app
-        $payload = [
-            'event' => 'in_transit',
-            'jo_id' => $jo->getID(),
-        ];
-
-        $mclientv2->sendEvent($jo, $payload);
-
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_ACCEPT);
 
@@ -579,7 +571,7 @@ class RiderAppController extends APIController
         return new APIResponse(true, 'Rider arrive at hub pre jo.', $data);
     }
 
-    public function preHubDepart(Request $req, EntityManagerInterface $em)
+    public function preHubDepart(Request $req, EntityManagerInterface $em, MQTTClientApiv2 $mclientv2)
     {
         $required_params = [];
         $missing = $this->checkMissingParameters($req, $required_params);
@@ -605,6 +597,14 @@ class RiderAppController extends APIController
         // set delivery status
         $jo->setDeliveryStatus(DeliveryStatus::RIDER_DEPART_HUB_PRE_JO);
 
+        // NOTE: send new in transit event to new app
+        $payload = [
+            'event' => 'in_transit',
+            'jo_id' => $jo->getID(),
+        ];
+
+        $mclientv2->sendEvent($jo, $payload);
+
         // create time stamp event for JO event
         $event = new JOEvent();
         $event->setDateHappen(new DateTime())