diff --git a/ledger/src/shred/legacy.rs b/ledger/src/shred/legacy.rs
index 2a6b72b339..47911109b4 100644
--- a/ledger/src/shred/legacy.rs
+++ b/ledger/src/shred/legacy.rs
@@ -442,7 +442,7 @@ mod test {
             shred.common_header.index = MAX_CODE_SHREDS_PER_SLOT as u32;
             assert_matches!(
                 shred.sanitize(),
-                Err(Error::InvalidShredIndex(ShredType::Code, 557_056))
+                Err(Error::InvalidShredIndex(ShredType::Code, 32_768))
             );
         }
         // pos >= num_coding is invalid.
diff --git a/ledger/src/shred/shred_code.rs b/ledger/src/shred/shred_code.rs
index 8a55bdf90d..ba85d92af2 100644
--- a/ledger/src/shred/shred_code.rs
+++ b/ledger/src/shred/shred_code.rs
@@ -1,20 +1,17 @@
 use {
-    crate::{
-        shred::{
-            common::dispatch,
-            legacy, merkle,
-            traits::{Shred, ShredCode as ShredCodeTrait},
-            CodingShredHeader, Error, ShredCommonHeader, ShredType, SignedData,
-            DATA_SHREDS_PER_FEC_BLOCK, MAX_DATA_SHREDS_PER_SLOT, SIZE_OF_NONCE,
-        },
-        shredder::ERASURE_BATCH_SIZE,
+    crate::shred::{
+        common::dispatch,
+        legacy, merkle,
+        traits::{Shred, ShredCode as ShredCodeTrait},
+        CodingShredHeader, Error, ShredCommonHeader, ShredType, SignedData,
+        DATA_SHREDS_PER_FEC_BLOCK, MAX_DATA_SHREDS_PER_SLOT, SIZE_OF_NONCE,
     },
     solana_sdk::{clock::Slot, packet::PACKET_DATA_SIZE, signature::Signature},
     static_assertions::const_assert_eq,
 };
 
-const_assert_eq!(MAX_CODE_SHREDS_PER_SLOT, 32_768 * 17);
-pub const MAX_CODE_SHREDS_PER_SLOT: usize = MAX_DATA_SHREDS_PER_SLOT * (ERASURE_BATCH_SIZE[1] - 1);
+const_assert_eq!(MAX_CODE_SHREDS_PER_SLOT, 32_768);
+pub const MAX_CODE_SHREDS_PER_SLOT: usize = MAX_DATA_SHREDS_PER_SLOT;
 
 const_assert_eq!(ShredCode::SIZE_OF_PAYLOAD, 1228);
 
diff --git a/ledger/src/shredder.rs b/ledger/src/shredder.rs
index f64bd33061..ab5a890a32 100644
--- a/ledger/src/shredder.rs
+++ b/ledger/src/shredder.rs
@@ -1231,7 +1231,7 @@ mod tests {
 
     #[test]
     fn test_max_shreds_per_slot() {
-        for num_data_shreds in 0..128 {
+        for num_data_shreds in 32..128 {
             let num_coding_shreds = get_erasure_batch_size(num_data_shreds)
                 .checked_sub(num_data_shreds)
                 .unwrap();