diff --git a/src/banking_stage.rs b/src/banking_stage.rs
index 3a38095948..72ef275c61 100644
--- a/src/banking_stage.rs
+++ b/src/banking_stage.rs
@@ -552,7 +552,7 @@ mod tests {
         // Wait for Poh recorder to hit max height
         loop {
             let bank_tick_height = bank.tick_height();
-            if bank_tick_height >= leader_scheduler_config.ticks_per_slot {
+            if bank_tick_height >= ticks_per_slot {
                 break;
             }
             sleep(Duration::from_millis(10));
diff --git a/src/replay_stage.rs b/src/replay_stage.rs
index 7852c5a256..6a9ff332ae 100644
--- a/src/replay_stage.rs
+++ b/src/replay_stage.rs
@@ -292,7 +292,7 @@ impl ReplayStage {
                             );
                             if my_id == leader_id || my_id == last_leader_id {
                                 to_leader_sender.send(current_tick_height).unwrap();
-                            } else {
+                            } else if leader_id != last_leader_id {
                                 // TODO: Remove this soon once we boot the leader from ClusterInfo
                                 cluster_info.write().unwrap().set_leader(leader_id);
                             }