diff --git a/src/target/riscv/riscv-011.c b/src/target/riscv/riscv-011.c
index fe2858f02..e940d20fa 100644
--- a/src/target/riscv/riscv-011.c
+++ b/src/target/riscv/riscv-011.c
@@ -1442,10 +1442,6 @@ static int init_target(struct command_context *cmd_ctx,
 		return ERROR_FAIL;
 	riscv011_info_t *info = get_info(target);
 
-	select_dtmcontrol.num_bits = target->tap->ir_length;
-	select_dbus.num_bits = target->tap->ir_length;
-	select_idcode.num_bits = target->tap->ir_length;
-
 	target->reg_cache = calloc(1, sizeof(*target->reg_cache));
 	target->reg_cache->name = "RISC-V registers";
 	target->reg_cache->num_regs = REG_COUNT;
diff --git a/src/target/riscv/riscv-013.c b/src/target/riscv/riscv-013.c
index 84c83dc82..f6438a622 100644
--- a/src/target/riscv/riscv-013.c
+++ b/src/target/riscv/riscv-013.c
@@ -108,8 +108,8 @@ typedef enum {
 	DBUS_STATUS_BUSY = 3
 } dbus_status_t;
 #define DBUS_DATA_START				2
-#define DBUS_DATA_SIZE				34
-#define DBUS_ADDRESS_START			36
+#define DBUS_DATA_SIZE				32
+#define DBUS_ADDRESS_START			34
 
 typedef enum {
 	RE_OK,
@@ -1442,10 +1442,6 @@ static int init_target(struct command_context *cmd_ctx,
 		return ERROR_FAIL;
 	riscv013_info_t *info = get_info(target);
 
-	select_dtmcontrol.num_bits = target->tap->ir_length;
-	select_dbus.num_bits = target->tap->ir_length;
-	select_idcode.num_bits = target->tap->ir_length;
-
 	target->reg_cache = calloc(1, sizeof(*target->reg_cache));
 	target->reg_cache->name = "RISC-V registers";
 	target->reg_cache->num_regs = REG_COUNT;