diff --git a/core/src/repair_generic_traversal.rs b/core/src/repair_generic_traversal.rs
index 329da677e..b73efb665 100644
--- a/core/src/repair_generic_traversal.rs
+++ b/core/src/repair_generic_traversal.rs
@@ -111,6 +111,7 @@ fn get_unrepaired_path(
 pub fn get_closest_completion(
     tree: &HeaviestSubtreeForkChoice,
     blockstore: &Blockstore,
+    root_slot: Slot,
     slot_meta_cache: &mut HashMap<Slot, Option<SlotMeta>>,
     processed_slots: &mut HashSet<Slot>,
     limit: usize,
@@ -169,7 +170,7 @@ pub fn get_closest_completion(
     }
     v.sort_by(|(_, d1), (_, d2)| d1.cmp(d2));
 
-    let mut visited = HashSet::new();
+    let mut visited = HashSet::from([root_slot]);
     let mut repairs = Vec::new();
     let mut total_processed_slots = 0;
     for (slot, _) in v {
@@ -237,6 +238,7 @@ pub mod test {
         let (repairs, _) = get_closest_completion(
             &heaviest_subtree_fork_choice,
             &blockstore,
+            0, // root_slot
             &mut slot_meta_cache,
             &mut processed_slots,
             10,
@@ -261,14 +263,12 @@ pub mod test {
         let (repairs, _) = get_closest_completion(
             &heaviest_subtree_fork_choice,
             &blockstore,
+            0, // root_slot
             &mut slot_meta_cache,
             &mut processed_slots,
-            2,
-        );
-        assert_eq!(
-            repairs,
-            [ShredRepairType::Shred(0, 3), ShredRepairType::Shred(1, 3)]
+            1,
         );
+        assert_eq!(repairs, [ShredRepairType::Shred(1, 3)]);
     }
 
     fn add_tree_with_missing_shreds(
diff --git a/core/src/repair_weight.rs b/core/src/repair_weight.rs
index 412121271..ba280b344 100644
--- a/core/src/repair_weight.rs
+++ b/core/src/repair_weight.rs
@@ -478,6 +478,7 @@ impl RepairWeight {
             let (new_repairs, new_processed_slots) = get_closest_completion(
                 tree,
                 blockstore,
+                self.root,
                 slot_meta_cache,
                 processed_slots,
                 max_new_repairs - repairs.len(),