diff --git a/client/internal/dns/server.go b/client/internal/dns/server.go index 74ab6717f..65b90e5f0 100644 --- a/client/internal/dns/server.go +++ b/client/internal/dns/server.go @@ -467,6 +467,11 @@ func (s *DefaultServer) applyHostConfig() { return } + // prevent reapplying config if we're shutting down + if s.ctx.Err() != nil { + return + } + config := s.currentConfig existingDomains := make(map[string]struct{})