diff --git a/pkg/service/rtcservice.go b/pkg/service/rtcservice.go
index f7faae6c7..ea633010f 100644
--- a/pkg/service/rtcservice.go
+++ b/pkg/service/rtcservice.go
@@ -53,6 +53,7 @@ func (s *RTCService) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	reconnectParam := r.FormValue("reconnect")
 	protocolParam := r.FormValue("protocol")
 	autoSubParam := r.FormValue("auto_subscribe")
+	// plan b does not work fully at the moment.
 	planBParam := r.FormValue("planb")
 
 	claims := GetGrants(r.Context())
diff --git a/pkg/service/server.go b/pkg/service/server.go
index 5624c3534..507c2d068 100644
--- a/pkg/service/server.go
+++ b/pkg/service/server.go
@@ -168,6 +168,9 @@ func (s *LivekitServer) Start() error {
 
 	go s.backgroundWorker()
 
+	// give time for Serve goroutine to start
+	time.Sleep(10 * time.Millisecond)
+
 	s.running.TrySet(true)
 
 	<-s.doneChan