diff --git a/web/handler.go b/web/handler.go
index b9c5727..9b5b1dd 100644
--- a/web/handler.go
+++ b/web/handler.go
@@ -107,11 +107,15 @@ func statisticsHandler(w http.ResponseWriter, r *http.Request) {
 		uid := r.URL.Query()["uid"][0]
 		connectedClients[name][uid] = currentTime
 	}
+	toDelete := make([]string, 0)
 	for uid, oldTime := range connectedClients[name] {
 		if currentTime-oldTime > 40 {
-			delete(connectedClients, uid)
+			toDelete = append(toDelete, uid)
 		}
 	}
+	for _, uid := range toDelete {
+		delete(connectedClients[name], uid)
+	}
 
 	// Get requested stream
 	stream, err := streams.Get(name)