diff --git a/runtime/src/bank.rs b/runtime/src/bank.rs
index 83c8794455..5104cc29fb 100644
--- a/runtime/src/bank.rs
+++ b/runtime/src/bank.rs
@@ -3651,14 +3651,12 @@ impl Bank {
     }
 
     fn fix_recent_blockhashes_sysvar_delay(&self) -> bool {
-        let activation_slot = match self.cluster_type() {
-            ClusterType::Development => 0,
-            ClusterType::Devnet => 0,
-            ClusterType::Testnet => 27_740_256, // Epoch 76
-            ClusterType::MainnetBeta => Slot::MAX / 2,
-        };
-
-        self.slot() >= activation_slot
+        match self.cluster_type() {
+            ClusterType::Development | ClusterType::Devnet | ClusterType::Testnet => true,
+            ClusterType::MainnetBeta => self
+                .feature_set
+                .is_active(&feature_set::consistent_recent_blockhashes_sysvar::id()),
+        }
     }
 
     // only used for testing
diff --git a/runtime/src/feature_set.rs b/runtime/src/feature_set.rs
index 6d17f2ddbc..233153f04b 100644
--- a/runtime/src/feature_set.rs
+++ b/runtime/src/feature_set.rs
@@ -13,11 +13,16 @@ pub mod secp256k1_program_enabled {
     solana_sdk::declare_id!("E3PHP7w8kB7np3CTQ1qQ2tW3KCtjRSXBQgW9vM2mWv2Y");
 }
 
+pub mod consistent_recent_blockhashes_sysvar {
+    solana_sdk::declare_id!("3h1BQWPDS5veRsq6mDBWruEpgPxRJkfwGexg5iiQ9mYg");
+}
+
 lazy_static! {
     /// Map of feature identifiers to user-visible description
     pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
         (instructions_sysvar_enabled::id(), "instructions sysvar"),
-        (secp256k1_program_enabled::id(), "secp256k1 program")
+        (secp256k1_program_enabled::id(), "secp256k1 program"),
+        (consistent_recent_blockhashes_sysvar::id(), "consistent recentblockhashes sysvar"),
         /*************** ADD NEW FEATURES HERE ***************/
     ]
     .iter()