diff --git a/Modules/Linksehat/Http/Controllers/Api/ChatController.php b/Modules/Linksehat/Http/Controllers/Api/ChatController.php
index 5a6624d5..9f2ee112 100644
--- a/Modules/Linksehat/Http/Controllers/Api/ChatController.php
+++ b/Modules/Linksehat/Http/Controllers/Api/ChatController.php
@@ -3,6 +3,7 @@
 namespace Modules\Linksehat\Http\Controllers\Api;
 
 use App\Models\Channel;
+use App\Events\ChatMessageSent;
 use App\Models\UserChannel;
 use App\Models\Message;
 use App\Models\File;
@@ -72,8 +73,8 @@ class ChatController extends Controller
         
         if (!$channel) {
             $dataChannel = Channel::where('doctor_id',$request->user_id)->get()->toArray();
+            $data = [];
             if ($dataChannel){
-                $data = [];
                 foreach($dataChannel as $d){
                     $user = User::with('detail')->where('nID', $d['member_id'])->first();
                     $lastMessage = Message::where('channel_id', $d['id'])
@@ -150,6 +151,8 @@ class ChatController extends Controller
             $person = User::where('nID', $channel->member_id)->first();
             $name = $person->sFirstName . ' ' . $person->sLastName; 
         }
+
+        ChatMessageSent::dispatch($message);
         
         return response()->json([
             'message' => 'Message sent successfully', 
diff --git a/app/Events/ChatMessageSent.php b/app/Events/ChatMessageSent.php
index b249aa12..33f9a663 100644
--- a/app/Events/ChatMessageSent.php
+++ b/app/Events/ChatMessageSent.php
@@ -24,6 +24,7 @@ class ChatMessageSent implements ShouldBroadcast
     public function __construct($message)
     {
         $this->message = $message;
+        $this->dontBroadcastToCurrentUser();
     }
 
     /**
@@ -33,7 +34,7 @@ class ChatMessageSent implements ShouldBroadcast
      */
     public function broadcastOn()
     {
-        return new PrivateChannel('chat');
+        return new PrivateChannel('chat'. $this->message->channel_id);
 
     }
 }