diff --git a/components/esp_hw_support/port/esp32c3/esp_hmac.c b/components/esp_hw_support/port/esp32c3/esp_hmac.c
index 0e4850608b..0d51b82148 100644
--- a/components/esp_hw_support/port/esp32c3/esp_hmac.c
+++ b/components/esp_hw_support/port/esp32c3/esp_hmac.c
@@ -169,9 +169,9 @@ esp_err_t esp_hmac_jtag_enable(hmac_key_id_t key_id, const uint8_t *token)
 esp_err_t esp_hmac_jtag_disable()
 {
     esp_crypto_hmac_lock_acquire();
-
+    ets_hmac_enable();
     REG_SET_BIT(HMAC_SET_INVALIDATE_JTAG_REG, HMAC_INVALIDATE_JTAG);
-
+    ets_hmac_disable();
     esp_crypto_hmac_lock_release();
 
     ESP_LOGD(TAG, "Invalidate JTAG result register. JTAG disabled.");
diff --git a/components/esp_hw_support/port/esp32h2/esp_hmac.c b/components/esp_hw_support/port/esp32h2/esp_hmac.c
index 9a78447dfc..5ff9520aec 100644
--- a/components/esp_hw_support/port/esp32h2/esp_hmac.c
+++ b/components/esp_hw_support/port/esp32h2/esp_hmac.c
@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2015-2021 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2015-2024 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Apache-2.0
  */
@@ -169,9 +169,9 @@ esp_err_t esp_hmac_jtag_enable(hmac_key_id_t key_id, const uint8_t *token)
 esp_err_t esp_hmac_jtag_disable()
 {
     esp_crypto_hmac_lock_acquire();
-
+    ets_hmac_enable();
     REG_SET_BIT(HMAC_SET_INVALIDATE_JTAG_REG, HMAC_INVALIDATE_JTAG);
-
+    ets_hmac_disable();
     esp_crypto_hmac_lock_release();
 
     ESP_LOGD(TAG, "Invalidate JTAG result register. JTAG disabled.");
diff --git a/components/esp_hw_support/port/esp32s2/esp_hmac.c b/components/esp_hw_support/port/esp32s2/esp_hmac.c
index c8b647d2d3..a54a156496 100644
--- a/components/esp_hw_support/port/esp32s2/esp_hmac.c
+++ b/components/esp_hw_support/port/esp32s2/esp_hmac.c
@@ -89,9 +89,9 @@ esp_err_t esp_hmac_jtag_enable(hmac_key_id_t key_id, const uint8_t *token)
 esp_err_t esp_hmac_jtag_disable()
 {
     esp_crypto_dma_lock_acquire();
-
+    ets_hmac_enable();
     REG_WRITE(HMAC_SET_INVALIDATE_JTAG_REG, 1);
-
+    ets_hmac_disable();
     esp_crypto_dma_lock_release();
 
     ESP_LOGD(TAG, "Invalidate JTAG result register. JTAG disabled.");
diff --git a/components/esp_hw_support/port/esp32s3/esp_hmac.c b/components/esp_hw_support/port/esp32s3/esp_hmac.c
index a51328733a..21df51a33a 100644
--- a/components/esp_hw_support/port/esp32s3/esp_hmac.c
+++ b/components/esp_hw_support/port/esp32s3/esp_hmac.c
@@ -170,9 +170,9 @@ esp_err_t esp_hmac_jtag_enable(hmac_key_id_t key_id, const uint8_t *token)
 esp_err_t esp_hmac_jtag_disable()
 {
     esp_crypto_hmac_lock_acquire();
-
+    ets_hmac_enable();
     REG_SET_BIT(HMAC_SET_INVALIDATE_JTAG_REG, HMAC_INVALIDATE_JTAG);
-
+    ets_hmac_disable();
     esp_crypto_hmac_lock_release();
 
     ESP_LOGD(TAG, "Invalidate JTAG result register. JTAG disabled.");