diff --git a/components/efuse/src/esp32/esp_efuse_utility.c b/components/efuse/src/esp32/esp_efuse_utility.c
index 8b6374a6d0..f3731607a2 100644
--- a/components/efuse/src/esp32/esp_efuse_utility.c
+++ b/components/efuse/src/esp32/esp_efuse_utility.c
@@ -272,10 +272,19 @@ static void apply_repeat_encoding(const uint8_t *in_bytes, uint32_t *out_words,
 }
 #endif // CONFIG_EFUSE_VIRTUAL
 
+static void read_r_data(esp_efuse_block_t num_block, uint32_t* buf_r_data)
+{
+    int i = 0;
+    for (uint32_t addr_rd_block = range_read_addr_blocks[num_block].start; addr_rd_block <= range_read_addr_blocks[num_block].end; addr_rd_block += 4, ++i) {
+        buf_r_data[i] = esp_efuse_utility_read_reg(num_block, i);
+    }
+}
+
 // This function just checkes that given data for blocks will not rise a coding issue during the burn operation.
 // Encoded data will be set during the burn operation.
 esp_err_t esp_efuse_utility_apply_new_coding_scheme()
 {
+    uint8_t buf_r_data[COUNT_EFUSE_REG_PER_BLOCK * 4];
     // start with EFUSE_BLK1. EFUSE_BLK0 - always uses EFUSE_CODING_SCHEME_NONE.
     for (int num_block = EFUSE_BLK1; num_block < EFUSE_BLK_MAX; num_block++) {
         esp_efuse_coding_scheme_t scheme = esp_efuse_get_coding_scheme(num_block);
@@ -284,11 +293,12 @@ esp_err_t esp_efuse_utility_apply_new_coding_scheme()
             for (uint32_t addr_wr_block = range_write_addr_blocks[num_block].start; addr_wr_block <= range_write_addr_blocks[num_block].end; addr_wr_block += 4) {
                 if (REG_READ(addr_wr_block)) {
                     is_write_data = true;
+                    break;
                 }
             }
             if (is_write_data) {
+                read_r_data(num_block, (uint32_t*)buf_r_data);
                 uint8_t* buf_w_data = (uint8_t*)range_write_addr_blocks[num_block].start;
-                uint8_t* buf_r_data = (uint8_t*)range_read_addr_blocks[num_block].start;
                 if (scheme == EFUSE_CODING_SCHEME_3_4) {
                     if (*((uint32_t*)buf_w_data + 6) != 0 || *((uint32_t*)buf_w_data + 7) != 0) {
                         return ESP_ERR_CODING;
diff --git a/components/efuse/test/test_efuse_coding_scheme.c b/components/efuse/test/test_efuse_coding_scheme.c
index f85cbe511d..201ef48283 100644
--- a/components/efuse/test/test_efuse_coding_scheme.c
+++ b/components/efuse/test/test_efuse_coding_scheme.c
@@ -169,7 +169,7 @@ TEST_CASE("Test Coding Scheme for efuse manager", "[efuse]")
         }
         printf("\n");
 #endif
-        TEST_ASSERT_EQUAL_HEX32_ARRAY(encoded, w_data_after_coding, 8);
+        TEST_ASSERT_EQUAL_HEX32_ARRAY(buf, w_data_after_coding, 8);
     }
     esp_efuse_utility_reset();
     bootloader_random_disable();
@@ -193,7 +193,7 @@ TEST_CASE("Test data does not match the coding scheme", "[efuse]")
     esp_efuse_utility_reset();
 
     for (int i = 0; i < count_useful_reg; ++i) {
-        REG_WRITE(EFUSE_BLK2_WDATA0_REG + i * 4, 0xABCDEF01 + i);
+        TEST_ESP_OK(esp_efuse_utility_write_reg(2, i, 0xABCDEF01 + i));
     }
 
     if (coding_scheme == EFUSE_CODING_SCHEME_NONE) {