diff --git a/container/state.go b/container/state.go
index 11f8e48283..fe2b060d72 100644
--- a/container/state.go
+++ b/container/state.go
@@ -207,7 +207,7 @@ func (s *State) Wait(ctx context.Context, condition WaitCondition) <-chan StateS
 	// actually stopped.
 	waitRemove := s.waitRemove
 
-	resultC := make(chan StateStatus)
+	resultC := make(chan StateStatus, 1)
 
 	go func() {
 		select {