diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 30944835..9a9a44a5 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -3312,13 +3312,13 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
 
         $hub_id = $hub->getID();
 
-        // get in transit rider count aka flag_available is false AND current_jo_id is not null
-        $in_transit_query = $em->createQuery('SELECT count(r.id) FROM App\Entity\Rider r JOIN r.hub h WHERE h.id = :hub_id AND r.flag_available = false AND r.current_job_order IS NOT NULL');
+        // get in transit rider count aka flag_available is false AND current_jo_id is not null AND rider is active
+        $in_transit_query = $em->createQuery('SELECT count(r.id) FROM App\Entity\Rider r JOIN r.hub h WHERE h.id = :hub_id AND r.flag_available = false AND r.current_job_order IS NOT NULL AND r.flag_active = true');
         $in_transit_query->setParameters(['hub_id' => $hub_id]);
         $in_transit_count = $in_transit_query->getSingleScalarResult();
 
-        // get available rider count aka flag_available is true AND current_jo_id is null
-        $available_query = $em->createQuery('SELECT count(r.id) FROM App\Entity\Rider r JOIN r.hub h WHERE h.id = :hub_id AND r.flag_available = true AND r.current_job_order IS NULL');
+        // get available rider count aka flag_available is true AND current_jo_id is null AND rider is active
+        $available_query = $em->createQuery('SELECT count(r.id) FROM App\Entity\Rider r JOIN r.hub h WHERE h.id = :hub_id AND r.flag_available = true AND r.current_job_order IS NULL AND r.flag_active = true');
         $available_query->setParameters(['hub_id' => $hub_id]);
         $available_count = $available_query->getSingleScalarResult();