diff --git a/src/target/espressif/esp32c5.c b/src/target/espressif/esp32c5.c
index ae80545f3..dfed87f5d 100644
--- a/src/target/espressif/esp32c5.c
+++ b/src/target/espressif/esp32c5.c
@@ -150,8 +150,9 @@ static const char *esp32c5_csrs[] = {
 
 static const char *esp32c5_ro_csrs[] = {
 	/* read-only CSRs, cannot be save/restored as the write would fail */
-	"cycle", "time", "instreth", "cycleh", "instret", "timeh",
-	"hpmcounter8", "hpmcounter9", "hpmcounter13", "hpmcounter8h", "hpmcounter9h", "hpmcounter13h",
+	/* TODO: Workaround solution for OCD-1066. */
+	// "cycle", "time", "instreth", "cycleh", "instret", "timeh",
+	// "hpmcounter8", "hpmcounter9", "hpmcounter13", "hpmcounter8h", "hpmcounter9h", "hpmcounter13h",
 	"mintstatus",
 	/* custom exposed CSRs will start with 'csr_' prefix*/
 	"csr_mcpuid",
diff --git a/src/target/espressif/esp32c61.c b/src/target/espressif/esp32c61.c
index 7a8c28cc1..06737ad23 100644
--- a/src/target/espressif/esp32c61.c
+++ b/src/target/espressif/esp32c61.c
@@ -150,8 +150,9 @@ static const char *esp32c61_csrs[] = {
 
 static const char *esp32c61_ro_csrs[] = {
 	/* read-only CSRs, cannot be save/restored as the write would fail */
-	"cycle", "time", "instreth", "cycleh", "instret", "timeh",
-	"hpmcounter8", "hpmcounter9", "hpmcounter13", "hpmcounter8h", "hpmcounter9h", "hpmcounter13h",
+	/* TODO: Workaround solution for OCD-1066. */
+	// "cycle", "time", "instreth", "cycleh", "instret", "timeh",
+	// "hpmcounter8", "hpmcounter9", "hpmcounter13", "hpmcounter8h", "hpmcounter9h", "hpmcounter13h",
 	"mintstatus",
 	/* custom exposed CSRs will start with 'csr_' prefix*/
 	"csr_mcpuid",