diff --git a/internal/leadership/elector.go b/internal/leadership/elector.go
index 6bb0da26..f97d8c47 100644
--- a/internal/leadership/elector.go
+++ b/internal/leadership/elector.go
@@ -177,7 +177,7 @@ func (e *Elector) Start(ctx context.Context) error {
 					continue // lost leadership reelection; unusual but not a problem; don't log
 				}
 
-				e.Logger.Error(e.Name+": Error keeping leadership", "client_id", e.config.ClientID, "err", err)
+				e.Logger.ErrorContext(ctx, e.Name+": Error keeping leadership", "client_id", e.config.ClientID, "err", err)
 			}
 		}
 	}()
@@ -202,7 +202,7 @@ func (e *Elector) attemptGainLeadershipLoop(ctx context.Context) error {
 
 			numErrors++
 			sleepDuration := e.ExponentialBackoff(numErrors, baseservice.MaxAttemptsBeforeResetDefault)
-			e.Logger.Error(e.Name+": Error attempting to elect", "client_id", e.config.ClientID, "err", err, "num_errors", numErrors, "sleep_duration", sleepDuration)
+			e.Logger.ErrorContext(ctx, e.Name+": Error attempting to elect", "client_id", e.config.ClientID, "err", err, "num_errors", numErrors, "sleep_duration", sleepDuration)
 			e.CancellableSleep(ctx, sleepDuration)
 			continue
 		}
@@ -237,13 +237,13 @@ func (e *Elector) attemptGainLeadershipLoop(ctx context.Context) error {
 func (e *Elector) handleLeadershipNotification(ctx context.Context, topic notifier.NotificationTopic, payload string) {
 	if topic != notifier.NotificationTopicLeadership {
 		// This should not happen unless the notifier is broken.
-		e.Logger.Error(e.Name+": Received unexpected notification", "client_id", e.config.ClientID, "topic", topic, "payload", payload)
+		e.Logger.ErrorContext(ctx, e.Name+": Received unexpected notification", "client_id", e.config.ClientID, "topic", topic, "payload", payload)
 		return
 	}
 
 	notification := dbLeadershipNotification{}
 	if err := json.Unmarshal([]byte(payload), &notification); err != nil {
-		e.Logger.Error(e.Name+": Unable to unmarshal leadership notification", "client_id", e.config.ClientID, "err", err)
+		e.Logger.ErrorContext(ctx, e.Name+": Unable to unmarshal leadership notification", "client_id", e.config.ClientID, "err", err)
 		return
 	}
 
@@ -291,7 +291,7 @@ func (e *Elector) keepLeadershipLoop(ctx context.Context) error {
 	// This doesn't use ctx because it runs *after* the ctx is done.
 	defer func() {
 		if !lostLeadership {
-			e.attemptResignLoop(ctx) // will resign using background context, but ctx sent for logging
+			e.attemptResignLoop(ctx) // will resign using WithoutCancel context, but ctx sent for logging
 		}
 	}()
 
@@ -373,16 +373,17 @@ func (e *Elector) attemptResignLoop(ctx context.Context) {
 	// still be elected.
 	const maxNumErrors = 3
 
-	// This does not inherit the parent context because we want to give up leadership
-	// even during a shutdown. There is no way to short-circuit this.
-	ctx = context.Background()
+	// This does not inherit the parent context's cancellation because we want to
+	// give up leadership even during a shutdown. There is no way to short-circuit
+	// this, though there are timeouts per call within attemptResign.
+	ctx = context.WithoutCancel(ctx)
 
 	for attempt := 1; attempt <= maxNumErrors; attempt++ {
 		if err := e.attemptResign(ctx, attempt); err != nil { //nolint:contextcheck
-			e.Logger.Error(e.Name+": Error attempting to resign", "attempt", attempt, "client_id", e.config.ClientID, "err", err)
+			e.Logger.ErrorContext(ctx, e.Name+": Error attempting to resign", "attempt", attempt, "client_id", e.config.ClientID, "err", err)
 
 			sleepDuration := e.ExponentialBackoff(attempt, baseservice.MaxAttemptsBeforeResetDefault)
-			e.Logger.Error(e.Name+": Error attempting to resign",
+			e.Logger.ErrorContext(ctx, e.Name+": Error attempting to resign",
 				"client_id", e.config.ClientID, "err", err, "num_errors", attempt, "sleep_duration", sleepDuration)
 			e.CancellableSleep(ctx, sleepDuration) //nolint:contextcheck