diff --git a/api/orders/listForKDS.cfm b/api/orders/listForKDS.cfm
index e111d76..de4d9bb 100644
--- a/api/orders/listForKDS.cfm
+++ b/api/orders/listForKDS.cfm
@@ -198,8 +198,8 @@
       "StatusID": qOrders.StatusID,
       "ServicePointID": qOrders.ServicePointID,
       "Remarks": qOrders.Remarks,
-      "SubmittedOn": qOrders.SubmittedOn,
-      "LastEditedOn": qOrders.LastEditedOn,
+      "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'"),
       "Name": qOrders.Name,
       "FirstName": qOrders.FirstName,
       "LastName": qOrders.LastName,