diff --git a/src/Controller/RoomController.php b/src/Controller/RoomController.php
index f349cbd..2f86e63 100644
--- a/src/Controller/RoomController.php
+++ b/src/Controller/RoomController.php
@@ -19,12 +19,14 @@ class RoomController extends AbstractController
             'GET'
         ]
     )]
-    public function index(): Response
+    public function index(
+        ?Request $request
+    ): Response
     {
         return $this->redirectToRoute(
             'room_namespace',
             [
-                'namespace' => $this->getParameter('app.kevacoin.room.namespace.default')
+                'namespace' => $request->get('namespace') ? $request->get('namespace') : $this->getParameter('app.kevacoin.room.namespace.default')
             ]
         );
     }
diff --git a/templates/default/module/room.html.twig b/templates/default/module/room.html.twig
index 9c6d9b1..3c64fb4 100644
--- a/templates/default/module/room.html.twig
+++ b/templates/default/module/room.html.twig
@@ -1,4 +1,4 @@
-<form name="room" action="{{ path('room_namespace', { namespace : room.namespace }) }}" method="get">
+<form name="room" action="{{ path('room_index') }}" method="get">
     <input type="text" name="namespace" value="{{ room.namespace }}" placeholder="{{ 'join room by kevacoin namespace...' | trans }}" />
 </form>
 {% if list %}