diff --git a/src/Entity/Rider.php b/src/Entity/Rider.php
index c588cc77..502d93bc 100644
--- a/src/Entity/Rider.php
+++ b/src/Entity/Rider.php
@@ -320,7 +320,18 @@ class Rider
     {
         // check if we have set a custom active
         if ($this->active_job_order != null)
-            return $this->active_job_order;
+        {
+            switch ($this->active_job_order->getStatus())
+            {
+                // if jo is open, return it
+                case JOStatus::ASSIGNED:
+                case JOStatus::IN_TRANSIT:
+                case JOStatus::IN_PROGRESS:
+                    return $this->active_job_order;
+            }
+
+            // if active jo is not open, get the next open one
+        }
 
         // no custom active job order
         $active_status = [