diff --git a/src/Controller/Events.php b/src/Controller/Events.php
index d037368..6c816aa 100644
--- a/src/Controller/Events.php
+++ b/src/Controller/Events.php
@@ -103,9 +103,9 @@ class Events extends Controller
      */
     private function getStreamByRequest(array $data): ?Streams
     {
-        $streamId = explode('_', $data['app'])[1];
+        $streamName = explode('/', $data['app'])[1];
 
-        $stream = $this->repository->find($streamId);
+        $stream = $this->repository->findOneBy(['name' => $streamName]);
 
         if ($stream !== null && $stream->getStreamKey() === $data['name']) {
             return $stream;
diff --git a/src/Controller/Streams.php b/src/Controller/Streams.php
index de0558a..e735af7 100644
--- a/src/Controller/Streams.php
+++ b/src/Controller/Streams.php
@@ -73,7 +73,7 @@ class Streams extends Controller
 
         $host = parse_url($this->container->getParameter('appHost'), PHP_URL_HOST);
         $data = $stream->jsonSerialize();
-        $data['streamUrl'] = sprintf('rtmp://%s/%s', $host, $stream->getUser()->getUsername() . '_' . $stream->getName());
+        $data['streamUrl'] = sprintf('rtmp://%s/%s', $host, $stream->getUser()->getUsername() . '/' . $stream->getName());
 
         return new JsonResponse($data);
     }