diff --git a/src/jtag/drivers/ch347.c b/src/jtag/drivers/ch347.c
index 530ac5096..57d1d0fdc 100644
--- a/src/jtag/drivers/ch347.c
+++ b/src/jtag/drivers/ch347.c
@@ -2333,13 +2333,17 @@ static int ch347_swd_switch_seq(enum swd_special_seq seq)
 static void ch347_swd_read_reg(uint8_t cmd, uint32_t *value, uint32_t ap_delay_clk)
 {
 	assert(cmd & SWD_CMD_RNW);
-	ch347_swd_queue_cmd(cmd, value, 0, ap_delay_clk);
+	int retval = ch347_swd_queue_cmd(cmd, value, 0, ap_delay_clk);
+	if (retval != ERROR_OK)
+		ch347_swd_context.queued_retval = retval;
 }
 
 static void ch347_swd_write_reg(uint8_t cmd, uint32_t value, uint32_t ap_delay_clk)
 {
 	assert(!(cmd & SWD_CMD_RNW));
-	ch347_swd_queue_cmd(cmd, NULL, value, ap_delay_clk);
+	int retval = ch347_swd_queue_cmd(cmd, NULL, value, ap_delay_clk);
+	if (retval != ERROR_OK)
+		ch347_swd_context.queued_retval = retval;
 }
 
 static const struct swd_driver ch347_swd = {