diff --git a/src/public/index.html b/src/public/index.html
index d0f9f77..566d0d9 100644
--- a/src/public/index.html
+++ b/src/public/index.html
@@ -5,12 +5,12 @@
         <meta http-equiv="X-UA-Compatible" content="IE=edge" />
         <meta name="viewport" content="width=device-width" />
         <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/water.css@2/out/water.css">
-        <script>  
+        <script>
             window.addEventListener("load", function(evt) {
                 var output = document.getElementById("output");
                 var input = document.getElementById("input");
                 var ws;
-            
+
                 var print = function(message) {
                     var before = output.innerHTML.split("<br>");
                     before.unshift(`<span>${new Date().toLocaleTimeString()} | ${message}</span>`);
@@ -56,8 +56,8 @@
                         ele.appendChild(document.createElement("br"));
                     }
                 }
-            
-                ws = new WebSocket("ws://"+window.location.host+"/ws");
+
+                ws = new WebSocket("ws://"+window.location.host+"/ws"+window.location.search);
                 ws.onopen = function(evt) {
                     print("READY");
                 }
@@ -88,7 +88,7 @@
                 ws.onerror = function(evt) {
                     print("ERROR: " + evt.data);
                 }
-            
+
                 document.getElementById("send").onclick = function(evt) {
                     if (!ws || !input.value) {
                         return false;
@@ -99,7 +99,7 @@
                     for (var i = 0; i < voiceEles.length; i++)
                         if (voiceEles[i].checked)
                             voiceIdx = voiceEles[i].value;
-                    
+
                     const data = JSON.stringify({
                         "Text": input.value,
                         "Pitch": Number.parseInt(document.getElementById("pitch").value, 10),
@@ -124,8 +124,8 @@
             #output > span:nth-child(1) {
                 opacity: 1;
             }
-            #output > span:nth-child(2) 
-            , #output > span:nth-child(3) 
+            #output > span:nth-child(2)
+            , #output > span:nth-child(3)
             {
                 opacity: 0.66;
             }
diff --git a/src/server/message.go b/src/server/message.go
index befd4f5..0b4c2e9 100644
--- a/src/server/message.go
+++ b/src/server/message.go
@@ -5,4 +5,5 @@ type message struct {
 	Pitch    int
 	Rate     float64
 	VoiceIdx int
+	room     string
 }
diff --git a/src/server/server.go b/src/server/server.go
index 1b483e9..1461587 100644
--- a/src/server/server.go
+++ b/src/server/server.go
@@ -31,9 +31,12 @@ func (s *Server) WS(w http.ResponseWriter, r *http.Request) error {
 	}
 	defer sess.Close()
 
+	log.Println("someone has joined", sess.room)
+	defer log.Println("someone has left", sess.room)
+
 	sess.cb = func(m message) error {
 		for i := range s.sessions {
-			if s.sessions[i].id != sess.id {
+			if s.sessions[i].id != sess.id && s.sessions[i].room == sess.room {
 				select {
 				case s.sessions[i].scatterc <- m:
 				case <-s.sessions[i].ctx.Done():
diff --git a/src/server/session.go b/src/server/session.go
index 7a19fb4..a451562 100644
--- a/src/server/session.go
+++ b/src/server/session.go
@@ -20,6 +20,7 @@ type session struct {
 	cb       func(message) error
 	id       string
 	scatterc chan (message)
+	room     string
 }
 
 var upgrader = websocket.Upgrader{}
@@ -34,6 +35,7 @@ func newSession(w http.ResponseWriter, r *http.Request, cb func(message) error)
 		cb:       cb,
 		id:       uuid.New().String(),
 		scatterc: make(chan message, 20),
+		room:     r.URL.Query().Get("room"),
 	}, err
 }
 
@@ -70,6 +72,7 @@ func (s *session) gather() {
 		if err := json.Unmarshal(msg, &m); err != nil {
 			return err
 		}
+		m.room = s.room
 
 		return s.cb(m)
 	})