diff --git a/src/hardware/scpi-dmm/api.c b/src/hardware/scpi-dmm/api.c
index b0689516..a462fdcf 100644
--- a/src/hardware/scpi-dmm/api.c
+++ b/src/hardware/scpi-dmm/api.c
@@ -54,12 +54,11 @@ static const struct scpi_command cmdset_agilent[] = {
 	{ DMM_CMD_QUERY_FUNC, "CONF?", },
 	{ DMM_CMD_START_ACQ, "INIT", },
 	{ DMM_CMD_STOP_ACQ, "ABORT", },
-	{ DMM_CMD_QUERY_VALUE, "READ?", },
+	{ DMM_CMD_QUERY_VALUE, "FETCH?", },
 	{ DMM_CMD_QUERY_PREC, "CONF?", },
 	{ DMM_CMD_QUERY_RANGE_AUTO, "%s:RANGE:AUTO?", },
 	{ DMM_CMD_QUERY_RANGE, "%s:RANGE?", },
-	{ DMM_CMD_SETUP_RANGE_AUTO, "%s:RANGE:AUTO ON", },
-	{ DMM_CMD_SETUP_RANGE, "%s:RANGE %s", },
+	{ DMM_CMD_SETUP_RANGE, "CONF:%s %s", },
 	ALL_ZERO,
 };
 
diff --git a/src/hardware/scpi-dmm/protocol.c b/src/hardware/scpi-dmm/protocol.c
index 97a783fe..1a967358 100644
--- a/src/hardware/scpi-dmm/protocol.c
+++ b/src/hardware/scpi-dmm/protocol.c
@@ -237,9 +237,8 @@ SR_PRIV int scpi_dmm_set_range_from_text(const struct sr_dev_inst *sdi,
 
 	is_auto = g_ascii_strcasecmp(range, "auto") == 0;
 	scpi_dmm_cmd_delay(sdi->conn);
-	ret = sr_scpi_cmd(sdi, devc->cmdset, 0, NULL,
-		is_auto ? DMM_CMD_SETUP_RANGE_AUTO : DMM_CMD_SETUP_RANGE,
-		item->scpi_func_setup, is_auto ? "" : range);
+	ret = sr_scpi_cmd(sdi, devc->cmdset, 0, NULL, DMM_CMD_SETUP_RANGE,
+		item->scpi_func_setup, is_auto ? "AUTO" : range);
 	if (ret != SR_OK)
 		return ret;