diff --git a/pkg/esign/service.go b/pkg/esign/service.go
index 43c489f3e..14c866fc3 100644
--- a/pkg/esign/service.go
+++ b/pkg/esign/service.go
@@ -95,7 +95,7 @@ func NewService(
 }
 
 func (s *Service) Run(ctx context.Context, presenterConfigFunc EmailPresenterConfigFunc) error {
-	g := errgroup.Group{}
+	g, gctx := errgroup.WithContext(ctx)
 
 	nonCancelableCtx := context.WithoutCancel(ctx)
 
@@ -119,7 +119,7 @@ func (s *Service) Run(ctx context.Context, presenterConfigFunc EmailPresenterCon
 	)
 	g.Go(func() error { return certWorker.Run(certWorkerCtx) })
 
-	<-ctx.Done()
+	<-gctx.Done()
 
 	stopSealingWorker()
 	stopCertWorker()