diff --git a/src/target/riscv/riscv-011.c b/src/target/riscv/riscv-011.c
index 3820d8fc0..bd3f159fb 100644
--- a/src/target/riscv/riscv-011.c
+++ b/src/target/riscv/riscv-011.c
@@ -1806,6 +1806,8 @@ static riscv_error_t handle_halt_routine(struct target *target)
 		}
 	}
 
+	scans_delete(scans);
+
 	if (dbus_busy) {
 		increase_dbus_busy_delay(target);
 		return RE_AGAIN;
@@ -1819,8 +1821,6 @@ static riscv_error_t handle_halt_routine(struct target *target)
 	info->dpc = reg_cache_get(target, CSR_DPC);
 	info->dcsr = reg_cache_get(target, CSR_DCSR);
 
-	scans_delete(scans);
-
 	cache_invalidate(target);
 
 	return RE_OK;