diff --git a/src/main/java/com/exactpro/th2/FixHandler.java b/src/main/java/com/exactpro/th2/FixHandler.java
index 3f4d869..b40f0c0 100644
--- a/src/main/java/com/exactpro/th2/FixHandler.java
+++ b/src/main/java/com/exactpro/th2/FixHandler.java
@@ -905,6 +905,7 @@ private void recovery(int beginSeqNo, int endSeqNo, RecoveryConfig recoveryConfi
                         LOGGER.info("Dropping recovery message. SeqNum is less than BeginSeqNo: {}", buf.toString(US_ASCII));
                         return true;
                     }
+
                     if(sequence > endSeq) {
                         LOGGER.info("Finishing recovery. SeqNum > EndSeq: {}", buf.toString(US_ASCII));
                         return false;
@@ -912,7 +913,7 @@ private void recovery(int beginSeqNo, int endSeqNo, RecoveryConfig recoveryConfi
 
                     if(recoveryConfig.getSequenceResetForAdmin() && ADMIN_MESSAGES.contains(msgType)) {
                         LOGGER.info("Dropping recovery message. Admin message sequence reset: {}", buf.toString(US_ASCII));
-                        return true;
+                        return sequence != endSeq;
                     }
                     FixField possDup = findField(buf, POSS_DUP_TAG);
                     if(possDup != null && Objects.equals(possDup.getValue(), IS_POSS_DUP)) return true;
@@ -964,7 +965,7 @@ private void recovery(int beginSeqNo, int endSeqNo, RecoveryConfig recoveryConfi
                     resetHeartbeatTask();
 
                     lastProcessedSequence.set(sequence);
-                    return true;
+                    return sequence != endSeq;
                 };
 
                 // waiting for messages to be writen in cradle
@@ -1673,8 +1674,8 @@ private Map<String, String> corruptMessageStructureProcessor(ByteBuf message, Ma
 
         CorruptMessageStructureConfiguration config = strategy.getCorruptMessageStructureConfiguration();
         FIXMessageStructureMutator mutator = new FIXMessageStructureMutator(
-                config.getHeaderTags(),
-                config.getTrailerTags()
+            config.getHeaderTags(),
+            config.getTrailerTags()
         );
         if (config.getMoveHeaderConfiguration() != null) {
             mutator.moveHeader(config.getMoveHeaderConfiguration().getPosition(), message);