diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index b5c6bfb07..f1a297a97 100644
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -2016,6 +2016,12 @@ static int examine(struct target *target)
 		return ERROR_FAIL;
 	}
 
+	if (get_field(dtmcontrol, DTM_DTMCS_DMISTAT) != DTM_DMI_OP_SUCCESS) {
+		if (dtmcs_scan(target->tap, DTM_DTMCS_DTMHARDRESET,
+				NULL /* discard result */) != ERROR_OK)
+			return ERROR_FAIL;
+	}
+
 	riscv013_info_t *info = get_info(target);
 
 	info->index = target->coreid;