diff --git a/genesis-programs/src/lib.rs b/genesis-programs/src/lib.rs
index 543e870bd7..e8f364a6f4 100644
--- a/genesis-programs/src/lib.rs
+++ b/genesis-programs/src/lib.rs
@@ -98,8 +98,10 @@ pub fn get_programs(operating_mode: OperatingMode, epoch: Epoch) -> Option<Vec<(
                     solana_stake_program!(),
                     solana_system_program(),
                     solana_vote_program!(),
-                    solana_bpf_loader_program!(),
                 ])
+            } else if epoch == 17 {
+                // Enable BPF effective epoch 17 for TdS
+                Some(vec![solana_bpf_loader_program!()])
             } else if epoch == std::u64::MAX {
                 // The epoch of std::u64::MAX is a placeholder and is expected to be reduced in a
                 // future hard fork.