diff --git a/rskj-core/src/main/java/co/rsk/core/bc/BlockExecutor.java b/rskj-core/src/main/java/co/rsk/core/bc/BlockExecutor.java
index 4a9c1b37582..78f80caa8ed 100644
--- a/rskj-core/src/main/java/co/rsk/core/bc/BlockExecutor.java
+++ b/rskj-core/src/main/java/co/rsk/core/bc/BlockExecutor.java
@@ -63,8 +63,6 @@ public class BlockExecutor {
     private final Map<Keccak256, ProgramResult> transactionResults = new HashMap<>();
     private boolean registerProgramResults;
 
-    private final Constants constants;
-    private final SignatureCache signatureCache;
     private final ClaimTransactionValidator claimTransactionValidator;
 
     public BlockExecutor(
@@ -76,8 +74,6 @@ public BlockExecutor(
         this.repositoryLocator = repositoryLocator;
         this.transactionExecutorFactory = transactionExecutorFactory;
         this.activationConfig = activationConfig;
-        this.constants = constants;
-        this.signatureCache = signatureCache;
         this.claimTransactionValidator = new ClaimTransactionValidator(signatureCache, constants);
     }
 
diff --git a/rskj-core/src/main/java/co/rsk/core/bc/TransactionPoolImpl.java b/rskj-core/src/main/java/co/rsk/core/bc/TransactionPoolImpl.java
index bfbf75209c0..9ff36a7085d 100644
--- a/rskj-core/src/main/java/co/rsk/core/bc/TransactionPoolImpl.java
+++ b/rskj-core/src/main/java/co/rsk/core/bc/TransactionPoolImpl.java
@@ -488,7 +488,9 @@ private boolean senderCanPayPendingTransactionsAndNewTx(Transaction newTx, Repos
 
         if(costWithNewTx.compareTo(currentRepository.getBalance(newTx.getSender(signatureCache))) <= 0) {
             return true;
-        } if(claimTxValidator.isFeatureActive(config.getActivationConfig().forBlock(bestBlock.getNumber()))) {
+        }
+
+        if(claimTxValidator.isFeatureActive(config.getActivationConfig().forBlock(bestBlock.getNumber()))) {
             return claimTxValidator.canPayPendingAndNewClaimTx(newTx, currentRepository, transactions);
         }