diff --git a/internal/dns/loop.go b/internal/dns/loop.go
index a48e245a..37b4748b 100644
--- a/internal/dns/loop.go
+++ b/internal/dns/loop.go
@@ -110,6 +110,9 @@ func (l *looper) Run(ctx context.Context, wg *sync.WaitGroup, dnsReadyCh chan<-
 
 		for l.GetSettings().Enabled {
 			if ctx.Err() != nil {
+				if !crashed {
+					l.running <- constants.Stopped
+				}
 				l.logger.Warn("context canceled: exiting loop")
 				return
 			}
diff --git a/internal/server/server.go b/internal/server/server.go
index 3eef45fd..564dbaa7 100644
--- a/internal/server/server.go
+++ b/internal/server/server.go
@@ -39,12 +39,11 @@ func New(address string, logging bool, logger logging.Logger,
 }
 
 func (s *server) Run(ctx context.Context, wg *sync.WaitGroup) {
+	defer wg.Done()
 	server := http.Server{Addr: s.address, Handler: s.handler}
 	go func() {
-		defer wg.Done()
 		<-ctx.Done()
-		s.logger.Warn("context canceled: exiting loop")
-		defer s.logger.Warn("loop exited")
+		s.logger.Warn("context canceled: shutting down")
 		const shutdownGraceDuration = 2 * time.Second
 		shutdownCtx, cancel := context.WithTimeout(context.Background(), shutdownGraceDuration)
 		defer cancel()
@@ -57,4 +56,5 @@ func (s *server) Run(ctx context.Context, wg *sync.WaitGroup) {
 	if err != nil && ctx.Err() != context.Canceled {
 		s.logger.Error(err)
 	}
+	s.logger.Warn("shut down")
 }