diff --git a/main.go b/main.go
index 9c397f9..cb6aedf 100644
--- a/main.go
+++ b/main.go
@@ -1,6 +1,8 @@
 package main
 
 import (
+  "crypto/rand"
+  "encoding/hex"
   "encoding/json"
   "fmt"
   "log"
@@ -27,7 +29,7 @@ type Ping struct {
   Status string `json:"status"`
 }
 
-var connections map[string][]chan []byte
+var connections map[string]map[string] chan []byte
 var redisClient *redis.Client
 
 func main() {
@@ -39,7 +41,7 @@ func main() {
   listen = os.Getenv("LISTEN")
   redisHost = os.Getenv("REDIS")
 
-  connections = make(map[string][]chan []byte)
+  connections = make(map[string]map[string] chan []byte)
 
   // Redis
   redisClient = redis.NewClient(&redis.Options{
@@ -58,6 +60,15 @@ func main() {
 	log.Fatal(http.ListenAndServe(listen, router))
 }
 
+func RandomHex() string {
+	b := make([]byte, 16)
+	_, err := rand.Read(b)
+	if err != nil {
+		panic("unable to generate 16 bytes of randomness")
+	}
+	return hex.EncodeToString(b)
+}
+
 func Subscribe(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
   flusher, ok := w.(http.Flusher)
   if !ok {
@@ -72,7 +83,8 @@ func Subscribe(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
   userId := p.ByName("userid")
 
   recv := make(chan []byte)
-  connections[userId] = append(connections[userId], recv);
+  chanId := RandomHex()
+  connections[userId][chanId] = recv
 
   // Refresh connection periodically
   resClosed := w.(http.CloseNotifier).CloseNotify()
@@ -102,7 +114,7 @@ func Subscribe(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
         w.Write([]byte(":\n\n"))
       case <- resClosed:
         ticker.Stop()
-        delete(connections, userId)
+        delete(connections[userId], chanId)
         return
     }
   }