diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 85ed87d7..1aa00065 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -595,7 +595,6 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
                 ->setServiceType($stype)
                 ->setWarrantyClass($req->request->get('warranty_class'))
                 ->setSource($req->request->get('source'))
-                ->setStatus(JOStatus::ASSIGNED)
                 ->setDeliveryInstructions($req->request->get('delivery_instructions'))
                 ->setTier1Notes($req->request->get('tier1_notes'))
                 ->setTier2Notes($req->request->get('tier2_notes'))
@@ -611,6 +610,12 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
             $jo->addMeta('discount', $discount);
             $jo->addMeta('service_charges', $service_charges);
 
+            // retain old jo status if it's an update JO
+            if ($old_jo_status != null)
+                $jo->setStatus($old_jo_status);
+            else
+                $jo->setStatus(JOStatus::ASSIGNED);
+
             // check if user is null, meaning call to create came from API
             if ($user != null)
             {