diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index b654a85f..2ad24546 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -2582,8 +2582,10 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
         {
             // reset distance limit if emergency
             //TODO: move to .env the emergency distance limit
-            $hub_criteria->setLimitDistance(500);
-            $hub_criteria->setEmergency(true);
+            $hub_criteria->setLimitDistance(500)
+                ->setEmergency(true)
+                ->setPaymentMethod(null)
+                ->setRoundRobin(false);
         }
 
         // set filter flags for inventory and available riders
@@ -2931,8 +2933,10 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
         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);
+            $hub_criteria->setLimitDistance(500)
+                ->setEmergency(true)
+                ->setPaymentMethod(null)
+                ->setRoundRobin(false);
         }
 
         // set filter flags for inventory and available riders