diff --git a/core/src/validator.rs b/core/src/validator.rs
index b0463821a1..76f86a3c5f 100644
--- a/core/src/validator.rs
+++ b/core/src/validator.rs
@@ -270,7 +270,9 @@ impl Validator {
         }
 
         let cluster_info = Arc::new(ClusterInfo::new(node.info.clone(), keypair.clone()));
-        let block_commitment_cache = Arc::new(RwLock::new(BlockCommitmentCache::default()));
+        let mut block_commitment_cache = BlockCommitmentCache::default();
+        block_commitment_cache.initialize_slots(bank.slot());
+        let block_commitment_cache = Arc::new(RwLock::new(block_commitment_cache));
 
         let subscriptions = Arc::new(RpcSubscriptions::new(
             &exit,
diff --git a/local-cluster/tests/local_cluster.rs b/local-cluster/tests/local_cluster.rs
index 11f83245a7..088a40ca20 100644
--- a/local-cluster/tests/local_cluster.rs
+++ b/local-cluster/tests/local_cluster.rs
@@ -472,6 +472,7 @@ fn run_kill_partition_switch_threshold<F>(
 }
 
 #[test]
+#[ignore]
 #[serial]
 fn test_kill_partition_switch_threshold_no_progress() {
     let max_switch_threshold_failure_pct = 1.0 - 2.0 * SWITCH_FORK_THRESHOLD;
@@ -500,6 +501,7 @@ fn test_kill_partition_switch_threshold_no_progress() {
 }
 
 #[test]
+#[ignore]
 #[serial]
 fn test_kill_partition_switch_threshold() {
     let max_switch_threshold_failure_pct = 1.0 - 2.0 * SWITCH_FORK_THRESHOLD;
diff --git a/runtime/src/commitment.rs b/runtime/src/commitment.rs
index 47a00feb77..a1b7648662 100644
--- a/runtime/src/commitment.rs
+++ b/runtime/src/commitment.rs
@@ -187,6 +187,11 @@ impl BlockCommitmentCache {
     pub fn set_highest_confirmed_root(&mut self, root: Slot) {
         self.commitment_slots.highest_confirmed_root = root;
     }
+
+    pub fn initialize_slots(&mut self, slot: Slot) {
+        self.commitment_slots.slot = slot;
+        self.commitment_slots.root = slot;
+    }
 }
 
 #[derive(Default, Clone, Copy)]