diff --git a/src/services/rabbitmq.ts b/src/services/rabbitmq.ts
index 3bb45ef6..79f9ef7f 100644
--- a/src/services/rabbitmq.ts
+++ b/src/services/rabbitmq.ts
@@ -126,6 +126,7 @@ async function handler(msg: amqp.ConsumeMessage): Promise<boolean> {
   sendWebSocket(
     "send-command-notification",
     {
+      success: true,
       message: `ระบบทำการออกคำสั่งเลขที่ ${command.commandNo}/${command.commandYear + 543}`,
       payload: command,
     },
@@ -169,6 +170,7 @@ async function handler(msg: amqp.ConsumeMessage): Promise<boolean> {
       sendWebSocket(
         "send-command-notification",
         {
+          success: true,
           message: `ระบบออกคำสั่งเลขที่ ${command.commandNo}/${command.commandYear + 543} เสร็จสิ้น`,
           payload: command,
         },
@@ -179,6 +181,15 @@ async function handler(msg: amqp.ConsumeMessage): Promise<boolean> {
     })
     .catch((e) => {
       console.error(e);
+      sendWebSocket(
+        "send-command-notification",
+        {
+          success: false,
+          message: `ระบบออกคำสั่งเลขที่ ${command.commandNo}/${command.commandYear + 543} ผิดพลาด`,
+          payload: command,
+        },
+        { userId: user.sub },
+      ).catch(console.error);
       return false;
     });
 }