diff --git a/components/esp_hw_support/esp_hmac.c b/components/esp_hw_support/esp_hmac.c
index c71c021d0e3..f79899b97d3 100644
--- a/components/esp_hw_support/esp_hmac.c
+++ b/components/esp_hw_support/esp_hmac.c
@@ -197,7 +197,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_WRITE(HMAC_SET_INVALIDATE_JTAG_REG, 1);
+    ets_hmac_disable();
     esp_crypto_hmac_lock_release();
 
     ESP_LOGD(TAG, "Invalidate JTAG result register. JTAG disabled.");
@@ -279,7 +281,9 @@ 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();