diff --git a/src/Service/JobOrderHandler/CMBJobOrderHandler.php b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
index 06f1fb72..e61108bf 100644
--- a/src/Service/JobOrderHandler/CMBJobOrderHandler.php
+++ b/src/Service/JobOrderHandler/CMBJobOrderHandler.php
@@ -1407,7 +1407,22 @@ class CMBJobOrderHandler implements JobOrderHandlerInterface
         $params['mode'] = 'onestep-edit';
         $params['cvid'] = $obj->getCustomerVehicle()->getID();
         $params['vid'] = $obj->getCustomerVehicle()->getVehicle()->getID();
-        $params['jo_service_charges'] = $obj->getMeta('service_charges');
+
+        // get service charges
+        $sc_array = [];
+        $jo_service_charges = $obj->getMeta('service_charges');
+        if (!(empty($jo_service_charges)))
+        {
+            foreach ($jo_service_charges as $jo_sc_id)
+            {
+                // find service charge
+                $sc_obj = $em->getRepository(ServiceCharge::class)->find($jo_sc_id);
+
+                $sc_array[] = $sc_obj;
+            }
+        }
+
+        $params['jo_service_charges'] = $sc_array;
 
         $this->fillDropdownParameters($params);
         $this->fillFormTags($params);
diff --git a/templates/job-order/cmb.form.onestep.html.twig b/templates/job-order/cmb.form.onestep.html.twig
index 4c913bca..c5246ddb 100644
--- a/templates/job-order/cmb.form.onestep.html.twig
+++ b/templates/job-order/cmb.form.onestep.html.twig
@@ -508,19 +508,19 @@
                                     {% endif %}
                                 </div>
                                 <!-- loop through existing service charges for job order -->
-                                {% for jo_sc_key, jo_sc in obj.getMeta('service_charges')|default([]) %}
+                                {% for jo_sc in jo_service_charges %}
                                     <div class="form-group m-form__group row">
                                         <div class="col-lg-6">
                                             <div class="col-lg-12 form-group-inner">
                                                 <select class="form-control m-input sc-select" name="service_charges">
                                                     {% for key, sc in service_charges %}
-                                                        <option value="{{ sc.getID }}" data-amount="{{ sc.getAmount }}"{{ jo_sc.id == sc.getID ? ' selected' }}>{{ sc.getName }}</option>
+                                                        <option value="{{ sc.getID }}" data-amount="{{ sc.getAmount }}"{{ jo_sc.getID == sc.getID ? ' selected' }}>{{ sc.getName }}</option>
                                                     {% endfor %}
                                                 </select>
                                             </div>
                                         </div>
                                         <div class="col-lg-5">
-                                            <input class="form-control sc-amount" type="text" value="0" disabled>
+                                            <input class="form-control sc-amount" type="text" value="{{ jo_sc.getAmount }}" disabled>
                                         </div>
                                         <div class="col-lg-1">
                                             <button class="btn btn-danger btn-sc-remove">X</button>