diff --git a/validator_client/src/attestation_service.rs b/validator_client/src/attestation_service.rs
index 67920f9cf5..daec479468 100644
--- a/validator_client/src/attestation_service.rs
+++ b/validator_client/src/attestation_service.rs
@@ -165,9 +165,7 @@ impl<T: SlotClock + 'static, E: EthSpec> AttestationService<T, E> {
                             }
 
                             Ok(())
-                        })
-                        // Prevent any errors from escaping and stopping the interval.
-                        .then(|_| Ok(())),
+                        }),
                 )
                 .map(move |_| info!(log_3, "Shutdown complete")),
         );
diff --git a/validator_client/src/block_service.rs b/validator_client/src/block_service.rs
index 4fc5370741..78731d18c9 100644
--- a/validator_client/src/block_service.rs
+++ b/validator_client/src/block_service.rs
@@ -146,9 +146,7 @@ impl<T: SlotClock + 'static, E: EthSpec> BlockService<T, E> {
                                 "error" => format!("{}", e)
                             }
                         })
-                        .for_each(move |_| service.clone().do_update())
-                        // Prevent any errors from escaping and stopping the interval.
-                        .then(|_| Ok(())),
+                        .for_each(move |_| service.clone().do_update().then(|_| Ok(()))),
                 )
                 .map(move |_| info!(log_2, "Shutdown complete")),
         );
diff --git a/validator_client/src/duties_service.rs b/validator_client/src/duties_service.rs
index de29180cd0..c83ebef8b0 100644
--- a/validator_client/src/duties_service.rs
+++ b/validator_client/src/duties_service.rs
@@ -268,9 +268,7 @@ impl<T: SlotClock + 'static, E: EthSpec> DutiesService<T, E> {
                                 "error" => format!("{}", e)
                             }
                         })
-                        .for_each(move |_| service.clone().do_update())
-                        // Prevent any errors from escaping and stopping the interval.
-                        .then(|_| Ok(())),
+                        .for_each(move |_| service.clone().do_update().then(|_| Ok(()))),
                 )
                 .map(move |_| info!(log_2, "Shutdown complete")),
         );
diff --git a/validator_client/src/fork_service.rs b/validator_client/src/fork_service.rs
index 4bc8fb355c..9ff3a0bf56 100644
--- a/validator_client/src/fork_service.rs
+++ b/validator_client/src/fork_service.rs
@@ -136,9 +136,7 @@ impl<T: SlotClock + 'static, E: EthSpec> ForkService<T, E> {
                                 "error" => format!("{}", e)
                             }
                         })
-                        .for_each(move |_| service.do_update())
-                        // Prevent any errors from escaping and stopping the interval.
-                        .then(|_| Ok(())),
+                        .for_each(move |_| service.do_update().then(|_| Ok(()))),
                 )
                 .map(move |_| info!(log_2, "Shutdown complete")),
         );