diff --git a/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config b/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config
index d2820acd..0793149e 100644
--- a/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config
+++ b/deploy/deploy-peer/src/main/resources/config/init/bftsmart.config
@@ -120,7 +120,7 @@ system.shutdownhook = true
 system.totalordermulticast.state_transfer = true
 
 #Maximum ahead-of-time message not discarded
-system.totalordermulticast.highMark = 10000
+system.totalordermulticast.highMark = 50
 
 #Maximum ahead-of-time message not discarded when the replica is still on EID 0 (after which the state transfer is triggered)
 system.totalordermulticast.revival_highMark = 10
diff --git a/libs/bft-smart b/libs/bft-smart
index 149fe4ee..f35ef526 160000
--- a/libs/bft-smart
+++ b/libs/bft-smart
@@ -1 +1 @@
-Subproject commit 149fe4eefac837903add354ccd5cd4ad70ff09b6
+Subproject commit f35ef52636acd406092e71bb5426055958519ba3