diff --git a/api/orders/listForKDS.cfm b/api/orders/listForKDS.cfm
index de4d9bb..fcb0af6 100644
--- a/api/orders/listForKDS.cfm
+++ b/api/orders/listForKDS.cfm
@@ -68,8 +68,8 @@
         o.StatusID,
         o.ServicePointID,
         o.Remarks,
-        o.SubmittedOn,
-        o.LastEditedOn,
+        DATE_FORMAT(o.SubmittedOn, '%Y-%m-%dT%H:%i:%sZ') AS SubmittedOn,
+        DATE_FORMAT(o.LastEditedOn, '%Y-%m-%dT%H:%i:%sZ') AS LastEditedOn,
         sp.Name AS Name,
         u.FirstName,
         u.LastName
@@ -94,8 +94,8 @@
         o.StatusID,
         o.ServicePointID,
         o.Remarks,
-        o.SubmittedOn,
-        o.LastEditedOn,
+        DATE_FORMAT(o.SubmittedOn, '%Y-%m-%dT%H:%i:%sZ') AS SubmittedOn,
+        DATE_FORMAT(o.LastEditedOn, '%Y-%m-%dT%H:%i:%sZ') AS LastEditedOn,
         sp.Name AS Name,
         u.FirstName,
         u.LastName
@@ -198,8 +198,8 @@
       "StatusID": qOrders.StatusID,
       "ServicePointID": qOrders.ServicePointID,
       "Remarks": qOrders.Remarks,
-      "SubmittedOn": isNull(qOrders.SubmittedOn) ? "" : dateTimeFormat(qOrders.SubmittedOn, "yyyy-MM-dd'T'HH:nn:ss'Z'"),
-      "LastEditedOn": isNull(qOrders.LastEditedOn) ? "" : dateTimeFormat(qOrders.LastEditedOn, "yyyy-MM-dd'T'HH:nn:ss'Z'"),
+      "SubmittedOn": qOrders.SubmittedOn,
+      "LastEditedOn": qOrders.LastEditedOn,
       "Name": qOrders.Name,
       "FirstName": qOrders.FirstName,
       "LastName": qOrders.LastName,