diff --git a/cmd/cp-main.go b/cmd/cp-main.go
index 4ec4b21e68..de5c292c71 100644
--- a/cmd/cp-main.go
+++ b/cmd/cp-main.go
@@ -315,7 +315,7 @@ func doCopySession(session *sessionV8) {
 	}
 
 	// Wait on status of doCopy() operation.
-	var statusCh = make(chan URLs)
+	var statusCh = make(chan URLs, 10000)
 
 	// Add a wait group.
 	var wg = new(sync.WaitGroup)
diff --git a/cmd/mirror-main.go b/cmd/mirror-main.go
index 66c782e009..97a52f537a 100644
--- a/cmd/mirror-main.go
+++ b/cmd/mirror-main.go
@@ -712,8 +712,8 @@ func newMirrorSession(session *sessionV8) *mirrorSession {
 		trapCh:    signalTrap(os.Interrupt, syscall.SIGTERM),
 		sessionV8: session,
 
-		statusCh:  make(chan URLs),
-		harvestCh: make(chan URLs),
+		statusCh:  make(chan URLs, 10000),
+		harvestCh: make(chan URLs, 10000),
 		errorCh:   make(chan *probe.Error),
 
 		watcher: NewWatcher(session.Header.When),
diff --git a/cmd/queue.go b/cmd/queue.go
index 02e5ea9d06..517d14d0e3 100644
--- a/cmd/queue.go
+++ b/cmd/queue.go
@@ -45,7 +45,7 @@ type Queue struct {
 // NewQueue creates a new queue
 func NewQueue() *Queue {
 	return &Queue{
-		idleCh: make(chan interface{}),
+		idleCh: make(chan interface{}, 10000),
 		closed: false,
 	}
 }