diff --git a/mev-boost-rs/src/service.rs b/mev-boost-rs/src/service.rs
index a773d135..b0d18ce4 100644
--- a/mev-boost-rs/src/service.rs
+++ b/mev-boost-rs/src/service.rs
@@ -81,18 +81,18 @@ impl Service {
 
         let relay_mux_clone = relay_mux.clone();
         let relay_task = tokio::spawn(async move {
+            let relay_mux = relay_mux_clone;
             let slots = clock.stream_slots();
 
             tokio::pin!(slots);
 
             let mut current_epoch = clock.current_epoch().expect("after genesis");
-            relay_mux_clone.on_epoch(current_epoch);
             while let Some(slot) = slots.next().await {
-                relay_mux_clone.on_slot(slot);
+                relay_mux.on_slot(slot);
 
-                let epoch = clock.current_epoch().expect("after genesis");
+                let epoch = clock.epoch_for(slot);
                 if epoch != current_epoch {
-                    relay_mux_clone.on_epoch(epoch);
+                    relay_mux.on_epoch(epoch);
                     current_epoch = epoch;
                 }
             }