diff --git a/beacon_node/beacon_chain/src/beacon_chain.rs b/beacon_node/beacon_chain/src/beacon_chain.rs
index 9da64888c2..b27b91108c 100644
--- a/beacon_node/beacon_chain/src/beacon_chain.rs
+++ b/beacon_node/beacon_chain/src/beacon_chain.rs
@@ -2038,7 +2038,9 @@ impl<T: BeaconChainTypes> BeaconChain<T> {
                 });
             }
 
-            if request_slot >= head_state.slot() {
+            let is_attesting_to_head_slot = request_slot >= head_state.slot();
+
+            if is_attesting_to_head_slot {
                 // When attesting to the head slot or later, always use the head of the chain.
                 beacon_block_root = head.beacon_block_root;
                 beacon_state_root = head.beacon_state_root();
diff --git a/validator_client/src/lib.rs b/validator_client/src/lib.rs
index b412db45f6..b1b81bc0ea 100644
--- a/validator_client/src/lib.rs
+++ b/validator_client/src/lib.rs
@@ -553,7 +553,6 @@ impl<E: EthSpec> ProductionValidatorClient<E> {
             beacon_nodes.clone(),
             context.executor.clone(),
         );
-
         let payload_attestation_service = PayloadAttestationService::new(
             duties_service.clone(),
             validator_store.clone(),
diff --git a/validator_client/validator_services/src/payload_attestation_service.rs b/validator_client/validator_services/src/payload_attestation_service.rs
index 24949edc1f..b36f0a0e47 100644
--- a/validator_client/validator_services/src/payload_attestation_service.rs
+++ b/validator_client/validator_services/src/payload_attestation_service.rs
@@ -189,6 +189,7 @@ impl<S: ValidatorStore + 'static, T: SlotClock + 'static> PayloadAttestationServ
         }
 
         let count = messages.len();
+
         let fork_name = self.chain_spec.fork_name_at_slot::<S::E>(slot);
         let result = self
             .beacon_nodes