diff --git a/core/packages/contracts/contracts/BeefyClient.sol b/core/packages/contracts/contracts/BeefyClient.sol
index 6d63f69221..696cc707f2 100644
--- a/core/packages/contracts/contracts/BeefyClient.sol
+++ b/core/packages/contracts/contracts/BeefyClient.sol
@@ -355,7 +355,7 @@ contract BeefyClient is Ownable {
         currentValidatorSet = nextValidatorSet;
         // Workaround for change in https://github.com/paritytech/polkadot/pull/6577
         // and discussions here in https://github.com/paritytech/substrate/issues/11797
-        nextValidatorSet.id = leaf.nextAuthoritySetID + 1;
+        nextValidatorSet.id = currentValidatorSet.id + 1;
         nextValidatorSet.length = leaf.nextAuthoritySetLen;
         nextValidatorSet.root = leaf.nextAuthoritySetRoot;