diff --git a/src/target/riscv/riscv.c b/src/target/riscv/riscv.c
index a266f5da3..e2d8e7098 100644
--- a/src/target/riscv/riscv.c
+++ b/src/target/riscv/riscv.c
@@ -3202,7 +3202,6 @@ void riscv_info_init(struct target *target, riscv_info_t *r)
 {
 	memset(r, 0, sizeof(*r));
 	r->dtm_version = 1;
-	r->registers_initialized = false;
 	r->current_hartid = target->coreid;
 	r->version_specific = NULL;
 
@@ -3301,16 +3300,12 @@ int riscv_set_current_hartid(struct target *target, int hartid)
 
 void riscv_invalidate_register_cache(struct target *target)
 {
-	RISCV_INFO(r);
-
 	LOG_DEBUG("[%d]", target->coreid);
 	register_cache_invalidate(target->reg_cache);
 	for (size_t i = 0; i < target->reg_cache->num_regs; ++i) {
 		struct reg *reg = &target->reg_cache->reg_list[i];
 		reg->valid = false;
 	}
-
-	r->registers_initialized = true;
 }
 
 int riscv_current_hartid(const struct target *target)
diff --git a/src/target/riscv/riscv.h b/src/target/riscv/riscv.h
index 0ae8945da..6eb915847 100644
--- a/src/target/riscv/riscv.h
+++ b/src/target/riscv/riscv.h
@@ -118,9 +118,6 @@ typedef struct {
 	/* The number of entries in the debug buffer. */
 	int debug_buffer_size;
 
-	/* This avoids invalidating the register cache too often. */
-	bool registers_initialized;
-
 	/* This hart contains an implicit ebreak at the end of the program buffer. */
 	bool impebreak;