diff --git a/src/Service/JobOrderHandler/ResqJobOrderHandler.php b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
index 5fc399b6..3a0351f8 100644
--- a/src/Service/JobOrderHandler/ResqJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/ResqJobOrderHandler.php
@@ -3522,16 +3522,17 @@ class ResqJobOrderHandler implements JobOrderHandlerInterface
             // offline - flag_available = 0 AND current_job_order is null
             $rider_status = '';
 
-            if ($rider->isAvailable() == true)
+            if ($rider->isAvailable())
+            { 
                 $rider_status = 'Online';
-
-            if (($rider->isAvailable() == false) &&
-                ($rider->getCurrentJobOrder() == null))
-                $rider_status = 'Offline';
-
-            if (($rider->isAvailable() == false) &&
-                ($rider->getCurrentJobOrder() != null))
-                $rider_status = 'In transit';
+            }
+            else
+            {
+                if ($rider->getCurrentJobOrder() == null)
+                    $rider_status = 'Offline';
+                else
+                    $rider_status = 'In transit';
+            }
 
             $rider_data[$rider->getID()] = [
                 'first_name' => $rider->getFirstName(),