diff --git a/bin/WebSocketServer.php b/bin/WebSocketServer.php
index 4d574a7..d110431 100644
--- a/bin/WebSocketServer.php
+++ b/bin/WebSocketServer.php
@@ -15,6 +15,7 @@ use Symfony\Component\Routing\Matcher\UrlMatcher;
 use ComCen\Http\LoginController;
 use ComCen\Http\RegisterController;
 use ComCen\Database\Handler;
+use \ComCen\Security\TokenHandler;
 
 class WebSocketServer implements MessageComponentInterface
 {
@@ -38,11 +39,13 @@ class WebSocketServer implements MessageComponentInterface
 
     public function onMessage(ConnectionInterface $from, $msg): void
     {
+        $decodedMsg = json_decode($msg, true);
+        if (!$decodedMsg) $from->send("not or empty json");
+        if (!TokenHandler::getTokenOwnership($decodedMsg['token'])) $from->send("invalid credentials");
         foreach ($this->connectedUsers as $conn) {
-            if ($from->resourceId !== $conn->resourceId) {
-                $conn->send("From user " . $from->resourceId . ": " . $msg);
-            }
+            $conn->send($decodedMsg["message"]);
         }
+
         $from->send("Message sent to others");
     }