diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index 00714aae7..57e31261b 100644
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -1334,6 +1334,9 @@ int wait_for_authbusy(struct target *target, uint32_t *dmstatus)
 static void deinit_target(struct target *target)
 {
 	LOG_DEBUG("riscv_deinit_target()");
+
+	dmi_write(target, DMI_DMCONTROL, 0);
+
 	riscv_info_t *info = (riscv_info_t *) target->arch_info;
 	free(info->version_specific);
 	/* TODO: free register arch_info */