diff --git a/client/src/components/dms-post-form/dms-post-form.component.jsx b/client/src/components/dms-post-form/dms-post-form.component.jsx
index e40b90286..e1358e989 100644
--- a/client/src/components/dms-post-form/dms-post-form.component.jsx
+++ b/client/src/components/dms-post-form/dms-post-form.component.jsx
@@ -187,8 +187,9 @@ export function DmsPostForm({ bodyshop, socket, job, logsRef }) {
               <Form.Item
                 name="dms_unsold"
                 label={t("jobs.fields.dms.dms_unsold")}
+                initialValue={false}
               >
-                <Switch defaultChecked={false} />
+                <Switch />
               </Form.Item>
             </Space>
           </div>
diff --git a/client/src/pages/dms/dms.container.jsx b/client/src/pages/dms/dms.container.jsx
index 75c26287b..77c670e60 100644
--- a/client/src/pages/dms/dms.container.jsx
+++ b/client/src/pages/dms/dms.container.jsx
@@ -45,7 +45,8 @@ export default connect(mapStateToProps, mapDispatchToProps)(DmsContainer);
 export const socket = SocketIO(
   process.env.NODE_ENV === "production"
     ? process.env.REACT_APP_AXIOS_BASE_API_URL
-    : window.location.origin,  //"http://localhost:4000" for dev testing,
+    : window.location.origin,
+    // "http://localhost:4000",  // for dev testing,
   {
     path: "/ws",
     withCredentials: true,
diff --git a/server/cdk/cdk-job-export.js b/server/cdk/cdk-job-export.js
index 117fc5bdc..5fee6b30d 100644
--- a/server/cdk/cdk-job-export.js
+++ b/server/cdk/cdk-job-export.js
@@ -717,22 +717,24 @@ async function InsertDmsVehicle(socket) {
           dealer: {
             dealerNumber: socket.JobData.bodyshop.cdk_dealerid,
             ...(socket.txEnvelope.inservicedate && {
-              inServiceDate: socket.txEnvelope.dms_unsold === true
-              ? ""
-              : moment(socket.txEnvelope.inservicedate)
-                //.tz(socket.JobData.bodyshop.timezone)
-                .startOf("day")
-                .toISOString(),
+              inServiceDate:
+                socket.txEnvelope.dms_unsold === true
+                  ? ""
+                  : moment(socket.txEnvelope.inservicedate)
+                      //.tz(socket.JobData.bodyshop.timezone)
+                      .startOf("day")
+                      .toISOString(),
             }),
             vehicleId: socket.DMSVid.vehiclesVehId,
           },
           manufacturer: {},
           vehicle: {
-            deliveryDate: socket.txEnvelope.dms_unsold === true
-            ? ""
-            : moment()
-              // .tz(socket.JobData.bodyshop.timezone)
-              .format("YYYYMMDD"),
+            deliveryDate:
+              socket.txEnvelope.dms_unsold === true
+                ? ""
+                : moment()
+                    // .tz(socket.JobData.bodyshop.timezone)
+                    .format("YYYYMMDD"),
             licensePlateNo:
               socket.JobData.plate_no === null
                 ? null
@@ -864,19 +866,25 @@ async function UpdateDmsVehicle(socket) {
             ...socket.DMSVeh.dealer,
             ...((socket.txEnvelope.inservicedate ||
               socket.DMSVeh.dealer.inServiceDate) && {
-              inServiceDate: moment(
-                socket.DMSVeh.dealer.inServiceDate ||
-                  socket.txEnvelope.inservicedate
-              )
-                // .tz(socket.JobData.bodyshop.timezone)
-                .toISOString(),
+              inServiceDate:
+                socket.txEnvelope.dms_unsold === true
+                  ? ""
+                  : moment(
+                      socket.DMSVeh.dealer.inServiceDate ||
+                        socket.txEnvelope.inservicedate
+                    )
+                      // .tz(socket.JobData.bodyshop.timezone)
+                      .toISOString(),
             }),
           },
           vehicle: {
             ...socket.DMSVeh.vehicle,
-            deliveryDate: moment(socket.DMSVeh.vehicle.deliveryDate)
-              //.tz(socket.JobData.bodyshop.timezone)
-              .toISOString(),
+            deliveryDate:
+              socket.txEnvelope.dms_unsold === true
+                ? ""
+                : moment(socket.DMSVeh.vehicle.deliveryDate)
+                    //.tz(socket.JobData.bodyshop.timezone)
+                    .toISOString(),
           },
           owners: ids,
         },