diff --git a/provider/docker/docker.go b/provider/docker/docker.go
index fc7bb84a1..1749a6fa3 100644
--- a/provider/docker/docker.go
+++ b/provider/docker/docker.go
@@ -210,10 +210,15 @@ func (p *Provider) Provide(configurationChan chan<- types.ConfigMessage, pool *s
 						}
 						configuration := p.buildConfiguration(containers)
 						if configuration != nil {
-							configurationChan <- types.ConfigMessage{
+							message := types.ConfigMessage{
 								ProviderName:  "docker",
 								Configuration: configuration,
 							}
+							select {
+							case configurationChan <- message:
+							case <-ctx.Done():
+							}
+
 						}
 					}