diff --git a/plugin/auto/setup.go b/plugin/auto/setup.go
index bd9479767..ced881366 100644
--- a/plugin/auto/setup.go
+++ b/plugin/auto/setup.go
@@ -71,6 +71,11 @@ func setup(c *caddy.Controller) error {
 
 	c.OnShutdown(func() error {
 		close(walkChan)
+		for _, z := range a.Zones.Z {
+			z.Lock()
+			z.OnShutdown()
+			z.Unlock()
+		}
 		return nil
 	})