diff --git a/pageserver/src/tenant/timeline/detach_ancestor.rs b/pageserver/src/tenant/timeline/detach_ancestor.rs
index 8ed1072169..e44622b262 100644
--- a/pageserver/src/tenant/timeline/detach_ancestor.rs
+++ b/pageserver/src/tenant/timeline/detach_ancestor.rs
@@ -283,8 +283,6 @@ impl SharedState {
 
         self.inner.lock().unwrap().validate(&attempt);
 
-        // FIXME: could check more preconditions, like that the timeline has been detached?
-
         let mut attempt = scopeguard::guard(attempt, |attempt| {
             // our attempt will no longer be valid, so release it
             self.inner.lock().unwrap().cancel(attempt);
@@ -319,6 +317,8 @@ impl SharedState {
             // Some(gate_entered) means the tenant was not restarted, as is not required
         }
 
+        assert!(timeline.ancestor_timeline.is_none());
+
         // this should be an 503 at least...?
         fail::fail_point!(
             "timeline-detach-ancestor::complete_before_uploading",