diff --git a/src/miner.cpp b/src/miner.cpp
index 9134024f6..89f52175a 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -518,12 +518,14 @@ CBlockTemplate* CreateNewBlock(const CChainParams& chainparams, const MinerAddre
         nonce >>= 16;
         pblock->nNonce = ArithToUint256(nonce);
 
+        uint32_t prevConsensusBranchId = CurrentEpochBranchId(pindexPrev->nHeight, chainparams.GetConsensus());
+
         // Fill in header
         pblock->hashPrevBlock  = pindexPrev->GetBlockHash();
         if (IsActivationHeight(nHeight, chainparams.GetConsensus(), Consensus::UPGRADE_HEARTWOOD)) {
             pblock->hashLightClientRoot.SetNull();
         } else if (chainparams.GetConsensus().NetworkUpgradeActive(nHeight, Consensus::UPGRADE_HEARTWOOD)) {
-            pblock->hashLightClientRoot = view.GetHistoryRoot(consensusBranchId);
+            pblock->hashLightClientRoot = view.GetHistoryRoot(prevConsensusBranchId);
         } else {
             pblock->hashLightClientRoot = sapling_tree.root();
         }