diff --git a/trace_decoder/src/imp.rs b/trace_decoder/src/imp.rs
index d5b370ea0..530533f7d 100644
--- a/trace_decoder/src/imp.rs
+++ b/trace_decoder/src/imp.rs
@@ -1,6 +1,8 @@
 use std::{
+    cmp,
     collections::{BTreeMap, BTreeSet},
     mem,
+    num::NonZero,
     ops::Range,
 };
 
@@ -63,13 +65,7 @@ pub fn entrypoint(
     let batches = middle(
         state,
         storage,
-        txn_info
-            .into_iter()
-            .pad_using(2, |_ix| TxnInfo::default())
-            .chunks(batch_size)
-            .into_iter()
-            .map(FromIterator::from_iter)
-            .collect(),
+        batch(txn_info, batch_size),
         &mut code,
         b_meta.block_timestamp,
         b_meta.parent_beacon_block_root,
@@ -188,6 +184,33 @@ fn start(
     })
 }
 
+/// Break `txns` into batches of length `hint`, prioritising creating at least
+/// two batches.
+fn batch(mut txns: Vec<TxnInfo>, hint: usize) -> Vec<Vec<TxnInfo>> {
+    let hint = cmp::min(hint, 1);
+    let n_batches = txns.iter().chunks(hint).into_iter().count();
+    match (txns.len(), n_batches) {
+        // enough
+        (_, 2..) => txns
+            .into_iter()
+            .chunks(hint)
+            .into_iter()
+            .map(FromIterator::from_iter)
+            .collect(),
+        // not enough batches at `hint`, but enough real transactions
+        (2.., ..2) => {
+            let second = txns.split_off(txns.len() / 2);
+            vec![txns, second]
+        }
+        // add padding
+        (0 | 1, _) => txns
+            .into_iter()
+            .pad_using(2, |_ix| TxnInfo::default())
+            .map(|it| vec![it])
+            .collect(),
+    }
+}
+
 #[derive(Debug)]
 struct Batch<StateTrieT> {
     pub first_txn_ix: usize,