diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts
index 3c38a25d..72c72ba9 100644
--- a/src/controllers/CommandController.ts
+++ b/src/controllers/CommandController.ts
@@ -869,10 +869,14 @@ export class CommandController extends Controller {
       detailHeader: command.detailHeader,
       detailBody: command.detailBody,
       detailFooter: command.detailFooter,
-      commandDate: Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandAffectDate)),
-      commandExcecuteDate: Extension.ToThaiNumber(
-        Extension.ToThaiFullDate2(command.commandExcecuteDate),
-      ),
+      commandDate:
+        command.commandAffectDate == null
+          ? null
+          : Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandAffectDate)),
+      commandExcecuteDate:
+        command.commandExcecuteDate == null
+          ? null
+          : Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandExcecuteDate)),
       name: "...................................",
       position: "...................................",
     };
@@ -908,10 +912,14 @@ export class CommandController extends Controller {
       detailHeader: command.detailHeader,
       detailBody: command.detailBody,
       detailFooter: command.detailFooter,
-      commandDate: Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandAffectDate)),
-      commandExcecuteDate: Extension.ToThaiNumber(
-        Extension.ToThaiFullDate2(command.commandExcecuteDate),
-      ),
+      commandDate:
+        command.commandAffectDate == null
+          ? null
+          : Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandAffectDate)),
+      commandExcecuteDate:
+        command.commandExcecuteDate == null
+          ? null
+          : Extension.ToThaiNumber(Extension.ToThaiFullDate2(command.commandExcecuteDate)),
       name: "...................................",
       position: "...................................",
     };