diff --git a/http-server/Events/WebSocket.php b/http-server/Events/WebSocket.php
index fccd6b25..bf7e8f2c 100644
--- a/http-server/Events/WebSocket.php
+++ b/http-server/Events/WebSocket.php
@@ -95,7 +95,7 @@ class WebSocket extends Server
 
 			/** @var AWebsocket $manager */
 			$manager = Snowflake::get()->annotation->get('websocket');
-			$manager->runWith($manager->getName(AWebsocket::MESSAGE, [0, $frame->data['route']]), [$frame, $server]);
+			$manager->runWith($manager->getName(AWebsocket::MESSAGE, [null, null, $frame->data['route']]), [$frame, $server]);
 		} catch (Exception $exception) {
 			$this->application->addError($exception->getMessage(), 'websocket');
 			$server->send($frame->fd, $exception->getMessage());
diff --git a/http-server/Route/Annotation/Websocket.php b/http-server/Route/Annotation/Websocket.php
index c0f1bcd3..d797e9f0 100644
--- a/http-server/Route/Annotation/Websocket.php
+++ b/http-server/Route/Annotation/Websocket.php
@@ -56,7 +56,7 @@ class Websocket extends Annotation
 	{
 		$prefix = 'WEBSOCKET:ANNOTATION:' . $events;
 		if (isset($comment[2])) {
-			return $prefix . ':' . $comment[2];
+			return rtrim($prefix, ':') . ':' . $comment[2];
 		}
 		return $prefix;
 	}