diff --git a/src/zapit/src/frontend.cpp b/src/zapit/src/frontend.cpp
index 66afddd72..20dbce74b 100644
--- a/src/zapit/src/frontend.cpp
+++ b/src/zapit/src/frontend.cpp
@@ -919,7 +919,6 @@ void CFrontend::sendMotorCommand(uint8_t cmdtype, uint8_t address, uint8_t comma
 	struct dvb_diseqc_master_cmd cmd;
 	int i;
 	fe_sec_tone_mode_t oldTone = currentToneMode;
-	fe_sec_voltage_t oldVoltage = currentVoltage;
 
 	printf("[fe%d] sendMotorCommand: cmdtype   = %x, address = %x, cmd   = %x\n", fenumber, cmdtype, address, command);
 	printf("[fe%d] sendMotorCommand: num_parms = %d, parm1   = %x, parm2 = %x\n", fenumber, num_parameters, parameter1, parameter2);
@@ -931,14 +930,17 @@ void CFrontend::sendMotorCommand(uint8_t cmdtype, uint8_t address, uint8_t comma
 	cmd.msg[4] = parameter2;
 	cmd.msg_len = 3 + num_parameters;
 
-	//secSetVoltage(config.highVoltage ? SEC_VOLTAGE_18 : SEC_VOLTAGE_13, 15);
 	secSetTone(SEC_TONE_OFF, 15);
-	secSetVoltage(SEC_VOLTAGE_13, 100);
+#if 0
+	fe_sec_voltage_t oldVoltage = currentVoltage;
+	//secSetVoltage(config.highVoltage ? SEC_VOLTAGE_18 : SEC_VOLTAGE_13, 15);
+	//secSetVoltage(SEC_VOLTAGE_13, 100);
+#endif
 
 	for(i = 0; i <= repeat; i++)
 		sendDiseqcCommand(&cmd, 50);
 
-	secSetVoltage(oldVoltage, 15);
+	//secSetVoltage(oldVoltage, 15);
 	secSetTone(oldTone, 15);
 	printf("[fe%d] motor command sent.\n", fenumber);
 
@@ -1614,7 +1616,9 @@ void CFrontend::gotoXX(t_satellite_position pos)
 	}
 
 	printf("RotorCmd = %04x\n", RotorCmd);
+	if (config.highVoltage)
+		secSetVoltage(SEC_VOLTAGE_18, 100);
 	sendMotorCommand(0xE0, 0x31, 0x6E, 2, ((RotorCmd & 0xFF00) / 0x100), RotorCmd & 0xFF, repeatUsals);
-	secSetVoltage(config.highVoltage ? SEC_VOLTAGE_18 : SEC_VOLTAGE_13, 15); //FIXME ?
+	//secSetVoltage(config.highVoltage ? SEC_VOLTAGE_18 : SEC_VOLTAGE_13, 15); //FIXME ?
 }