diff --git a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
index 464b41aa..8f59fb97 100644
--- a/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
+++ b/src/Service/RiderAPIHandler/CMBRiderAPIHandler.php
@@ -1160,7 +1160,7 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
         $this->em->persist($event);
 
         // set rider's active JO to null
-        $rider->setActiveJobOrder();
+        $rider->setActiveJobOrder(null);
 
         $this->em->flush();
 
@@ -1680,6 +1680,10 @@ class CMBRiderAPIHandler implements RiderAPIHandlerInterface
 
         // add event log
         $rider = $this->session->getRider();
+
+        // clear rider's active JO
+        $rider->setActiveJobOrder(null);
+
         $event = new JOEvent();
         $event->setDateHappen(new DateTime())
             ->setTypeID(CMBJOEventType::FULFILL)