diff --git a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
index a08464db1..049fa58dc 100644
--- a/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
+++ b/client/src/components/job-checklist/components/job-checklist-form/job-checklist-form.component.jsx
@@ -171,7 +171,12 @@ export function JobChecklistForm({
       });
     }
   };
-
+  console.log(job,{
+    removeFromProduction: true,
+    actual_completion:
+      job && job.actual_completion && moment(job.actual_completion),
+    actual_delivery: job && job.actual_delivery && moment(job.actual_delivery),
+  });
   return (
     <Card
       title={t("checklist.labels.checklist")}
@@ -195,21 +200,26 @@ export function JobChecklistForm({
             addToProduction: true,
             allow_text_message: job.owner && job.owner.allow_text_message,
             scheduled_completion:
-              (job && job.scheduled_completion) ||
-              (job.labbrs && job.larhrs
-                ? moment().businessAdd(
-                    (job.labhrs.aggregate.sum.mod_lb_hrs +
-                      job.larhrs.aggregate.sum.mod_lb_hrs) /
-                      bodyshop.target_touchtime,
-                    "days"
-                  )
-                : null),
-            scheduled_delivery: job && job.scheduled_delivery,
+              (job &&
+                job.scheduled_completion &&
+                moment(job.scheduled_completion)) ||
+              (job &&
+                job.labhrs &&
+                job.larhrs &&
+                moment().businessAdd(
+                  (job.labhrs.aggregate.sum.mod_lb_hrs ||
+                    0 + job.larhrs.aggregate.sum.mod_lb_hrs ||
+                    0) / bodyshop.target_touchtime,
+                  "days"
+                )),
+            scheduled_delivery: job && moment(job.scheduled_delivery),
           }),
           ...(type === "deliver" && {
             removeFromProduction: true,
-            actual_completion: job && job.actual_completion,
-            actual_delivery: job && job.actual_delivery,
+            actual_completion:
+              job && job.actual_completion && moment(job.actual_completion),
+            actual_delivery:
+              job && job.actual_delivery && moment(job.actual_delivery),
           }),
           ...formItems
             .filter((fi) => fi.value)
diff --git a/client/src/components/production-list-columns/production-list-columns.date.component.jsx b/client/src/components/production-list-columns/production-list-columns.date.component.jsx
index 59b59e420..4381d3b52 100644
--- a/client/src/components/production-list-columns/production-list-columns.date.component.jsx
+++ b/client/src/components/production-list-columns/production-list-columns.date.component.jsx
@@ -8,9 +8,6 @@ import { DateFormatter } from "../../utils/DateFormatter";
 
 import { useTranslation } from "react-i18next";
 
-const OneCalendarDay = 60 * 60 * 24 * 1000;
-const Now = new Date();
-
 export default function ProductionListDate({ record, field, time }) {
   const [updateAlert] = useMutation(UPDATE_JOB);
   const [visible, setVisible] = useState(false);
@@ -78,11 +75,7 @@ export default function ProductionListDate({ record, field, time }) {
               : ""
           }
         >
-          <DateFormatter
-            bordered={false}
-          >
-            {record[field]}
-          </DateFormatter>
+          <DateFormatter bordered={false}>{record[field]}</DateFormatter>
         </div>
       </Dropdown>
     </div>
diff --git a/client/src/graphql/bodyshop.queries.js b/client/src/graphql/bodyshop.queries.js
index 878f3a3e9..23905296a 100644
--- a/client/src/graphql/bodyshop.queries.js
+++ b/client/src/graphql/bodyshop.queries.js
@@ -262,6 +262,9 @@ export const QUERY_DELIVER_CHECKLIST = gql`
     jobs_by_pk(id: $jobId) {
       id
       ro_number
+      actual_completion
+      actual_delivery
+      
     }
   }
 `;
diff --git a/client/src/pages/jobs-deliver/jobs-delivery.page.container.jsx b/client/src/pages/jobs-deliver/jobs-delivery.page.container.jsx
index ff81b90ba..a87038f58 100644
--- a/client/src/pages/jobs-deliver/jobs-delivery.page.container.jsx
+++ b/client/src/pages/jobs-deliver/jobs-delivery.page.container.jsx
@@ -69,6 +69,7 @@ export function JobsDeliverContainer({
           checklistConfig={
             (data && data.bodyshops_by_pk.deliverchecklist) || {}
           }
+          job={data ? data.jobs_by_pk : {}}
         />
       </div>
     </RbacWrapper>