diff --git a/core/src/banking_stage.rs b/core/src/banking_stage.rs
index 71f2d69b2d..2b9a55df78 100644
--- a/core/src/banking_stage.rs
+++ b/core/src/banking_stage.rs
@@ -150,7 +150,9 @@ impl BankingStage {
         // Buffer the packets if I am the next leader
         // or, if it was getting sent to me
         let leader_id = match poh_recorder.lock().unwrap().bank() {
-            Some(bank) => leader_schedule_utils::slot_leader_at(bank.slot() + 1, &bank).unwrap(),
+            Some(bank) => {
+                leader_schedule_utils::slot_leader_at(bank.slot() + 1, &bank).unwrap_or_default()
+            }
             None => rcluster_info
                 .leader_data()
                 .map(|x| x.id)