diff --git a/src/llmq/ehf_signals.cpp b/src/llmq/ehf_signals.cpp
index e8660d1c7a..51dff1889e 100644
--- a/src/llmq/ehf_signals.cpp
+++ b/src/llmq/ehf_signals.cpp
@@ -44,7 +44,7 @@ CEHFSignalsHandler::~CEHFSignalsHandler()
 
 void CEHFSignalsHandler::UpdatedBlockTip(const CBlockIndex* const pindexNew)
 {
-    if (!fMasternodeMode || !llmq::utils::IsV20Active(pindexNew) || !sporkman.IsSporkActive(SPORK_24_EHF)) {
+    if (!fMasternodeMode || !llmq::utils::IsV20Active(pindexNew) || (Params().IsTestChain() && !sporkman.IsSporkActive(SPORK_24_TEST_EHF))) {
         return;
     }
 
diff --git a/src/spork.h b/src/spork.h
index 2b8f94d1d9..abda06fa06 100644
--- a/src/spork.h
+++ b/src/spork.h
@@ -41,7 +41,7 @@ enum SporkId : int32_t {
     SPORK_19_CHAINLOCKS_ENABLED                            = 10018,
     SPORK_21_QUORUM_ALL_CONNECTED                          = 10020,
     SPORK_23_QUORUM_POSE                                   = 10022,
-    SPORK_24_EHF                                           = 10023,
+    SPORK_24_TEST_EHF                                      = 10023,
 
     SPORK_INVALID                                          = -1,
 };
@@ -75,7 +75,7 @@ struct CSporkDef
     MAKE_SPORK_DEF(SPORK_19_CHAINLOCKS_ENABLED,            4070908800ULL), // OFF
     MAKE_SPORK_DEF(SPORK_21_QUORUM_ALL_CONNECTED,          4070908800ULL), // OFF
     MAKE_SPORK_DEF(SPORK_23_QUORUM_POSE,                   4070908800ULL), // OFF
-    MAKE_SPORK_DEF(SPORK_24_EHF,                           4070908800ULL), // OFF
+    MAKE_SPORK_DEF(SPORK_24_TEST_EHF,                      4070908800ULL), // OFF
 };
 #undef MAKE_SPORK_DEF
 extern std::unique_ptr<CSporkManager> sporkManager;
diff --git a/test/functional/feature_mnehf.py b/test/functional/feature_mnehf.py
index 376d7936ad..94f5a5e51f 100755
--- a/test/functional/feature_mnehf.py
+++ b/test/functional/feature_mnehf.py
@@ -259,7 +259,7 @@ class MnehfTest(DashTestFramework):
 
         self.log.info("activate MN_RR also by enabling spork 24")
         assert_equal(get_bip9_details(node, 'mn_rr')['status'], 'defined')
-        self.nodes[0].sporkupdate("SPORK_24_EHF", 0)
+        self.nodes[0].sporkupdate("SPORK_24_TEST_EHF", 0)
         self.wait_for_sporks_same()
 
         self.check_fork('defined')
diff --git a/test/functional/test_framework/test_framework.py b/test/functional/test_framework/test_framework.py
index 474ce3df06..c390078abb 100755
--- a/test/functional/test_framework/test_framework.py
+++ b/test/functional/test_framework/test_framework.py
@@ -1128,7 +1128,7 @@ class DashTestFramework(BitcoinTestFramework):
         self.activate_by_name('v20', expected_activation_height)
 
     def activate_mn_rr(self, expected_activation_height=None):
-        self.nodes[0].sporkupdate("SPORK_24_EHF", 0)
+        self.nodes[0].sporkupdate("SPORK_24_TEST_EHF", 0)
         self.wait_for_sporks_same()
         mn_rr_height = 0
         while mn_rr_height == 0: