diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 4ec6917d..1b6013e0 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -202,7 +202,13 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
             // check if customer is not willing to wait
             $will_not_wait = $orow->getWillWait();
             if ($will_not_wait == WillingToWaitContent::NOT_WILLING_TO_WAIT)
-                $is_emergency = true;
+            {
+                // check if reason is emergency or rush
+                $reason = $orow->getReasonNotWait();
+                if (($reason == CustomerNotWaitReason::EMERGENCY) ||
+                    ($reason == CustomerNotWaitReason::RUSH_REQUEST))
+                    $is_emergency = true;
+            }
            
             // add row data
             $row['id'] = $orow->getID();