diff --git a/pageserver/src/tenant/timeline.rs b/pageserver/src/tenant/timeline.rs
index 76dcb5645f..0343eda8b9 100644
--- a/pageserver/src/tenant/timeline.rs
+++ b/pageserver/src/tenant/timeline.rs
@@ -742,11 +742,15 @@ pub(crate) enum WaitLsnError {
 impl From<CreateImageLayersError> for CompactionError {
     fn from(e: CreateImageLayersError) -> Self {
         match e {
-            CreateImageLayersError::Cancelled => CompactionError::ShuttingDown,
+            CreateImageLayersError::Cancelled
+            | CreateImageLayersError::GetVectoredError(GetVectoredError::Cancelled)
+            | CreateImageLayersError::PageReconstructError(PageReconstructError::Cancelled) => {
+                CompactionError::ShuttingDown
+            }
             CreateImageLayersError::Other(e) => {
                 CompactionError::Other(e.context("create image layers"))
             }
-            _ => CompactionError::Other(e.into()),
+            value => CompactionError::Other(value.into()),
         }
     }
 }