diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 6f54f22f..4827bd59 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -2464,6 +2464,7 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
         if ($willing_to_wait == WillingToWaitContent::NOT_WILLING_TO_WAIT)
         {
             // reset distance limit if emergency
+            //TODO: move to .env the emergency distance limit
             $hub_criteria->setLimitDistance(500);
             $hub_criteria->setEmergency(true);
         }
@@ -2793,7 +2794,11 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
         // check if emergency or not
         $willing_to_wait = $obj->getWillWait();
         if ($willing_to_wait == WillingToWaitContent::NOT_WILLING_TO_WAIT)
+        {
+            //TODO: move to .env the emergency distance limit
+            $hub_criteria->setLimitDistance(500);
             $hub_criteria->setEmergency(true);
+        }
 
         // get JO and customer id for logging purposes
         $jo_id = $obj->getID();