diff --git a/src/Transports/HttpServerTransport.php b/src/Transports/HttpServerTransport.php
index 761aedf..f15d54c 100644
--- a/src/Transports/HttpServerTransport.php
+++ b/src/Transports/HttpServerTransport.php
@@ -184,9 +184,8 @@ private function handleSseRequest(ServerRequestInterface $request): Response
             }
 
             try {
-                $baseUri = $request->getUri()->withPath($this->messagePath)->withQuery('')->withFragment('');
-                $postEndpointWithId = (string) $baseUri->withQuery("clientId={$clientId}");
-                $this->sendSseEvent($sseStream, 'endpoint', $postEndpointWithId, "init-{$clientId}");
+                $postEndpoint = $this->messagePath . "?clientId={$clientId}";
+                $this->sendSseEvent($sseStream, 'endpoint', $postEndpoint, "init-{$clientId}");
 
                 $this->emit('client_connected', [$clientId]);
             } catch (Throwable $e) {