diff --git a/cmd/livepeer/starter/starter.go b/cmd/livepeer/starter/starter.go
index 885345ae03..90aeb56eb0 100755
--- a/cmd/livepeer/starter/starter.go
+++ b/cmd/livepeer/starter/starter.go
@@ -1690,9 +1690,9 @@ func StartLivepeer(ctx context.Context, cfg LivepeerConfig) {
 		exit("Error creating Livepeer server: err=%q", err)
 	}
 
-	ec := make(chan error)
-	tc := make(chan struct{})
-	wc := make(chan struct{})
+	ec := make(chan error, 1)
+	tc := make(chan struct{}, 1)
+	wc := make(chan struct{}, 1)
 	msCtx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
diff --git a/server/router.go b/server/router.go
index ff8c471412..eec04afa61 100644
--- a/server/router.go
+++ b/server/router.go
@@ -111,7 +111,7 @@ func getOrchestratorInfo(ctx context.Context, uris []*url.URL, req *net.Orchestr
 		return nil, errNoOrchestrators
 	}
 
-	infoCh := make(chan *net.OrchestratorInfo)
+	infoCh := make(chan *net.OrchestratorInfo, 1)
 	errCh := make(chan error, len(uris))
 
 	cctx, cancel := context.WithTimeout(ctx, getOrchestratorTimeout)