diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs
index 4274bd080a..0534c534bc 100644
--- a/pageserver/src/tenant/timeline.rs
+++ b/pageserver/src/tenant/timeline.rs
@@ -1795,9 +1795,6 @@ impl Timeline {
                     permit = wait_for_permit => {
                         (Some(permit), StartCircumstances::AfterBackgroundTasksRateLimit)
                     }
-                    _ = self_ref.cancel.cancelled() => {
-                        return Err(BackgroundCalculationError::Cancelled);
-                    }
                     _ = cancel.cancelled() => {
                         return Err(BackgroundCalculationError::Cancelled);
                     },
diff --git a/pageserver/src/tenant/timeline/eviction_task.rs b/pageserver/src/tenant/timeline/eviction_task.rs
index 6fd7464110..812d37ca95 100644
--- a/pageserver/src/tenant/timeline/eviction_task.rs
+++ b/pageserver/src/tenant/timeline/eviction_task.rs
@@ -72,7 +72,6 @@ impl Timeline {
                 let cancel = task_mgr::shutdown_token();
                 tokio::select! {
                     _ = cancel.cancelled() => { return Ok(()); }
-                    _ = self_clone.cancel.cancelled() => { return Ok(()); }
                     _ = completion::Barrier::maybe_wait(background_tasks_can_start) => {}
                 };
 
@@ -168,7 +167,6 @@ impl Timeline {
         let _permit = tokio::select! {
             permit = acquire_permit => permit,
             _ = cancel.cancelled() => return ControlFlow::Break(()),
-            _ = self.cancel.cancelled() => return ControlFlow::Break(()),
         };
 
         // If we evict layers but keep cached values derived from those layers, then