diff --git a/firmware/controllers/actuators/idle_hardware.cpp b/firmware/controllers/actuators/idle_hardware.cpp
index 9f1cbb024f..4d851e75c4 100644
--- a/firmware/controllers/actuators/idle_hardware.cpp
+++ b/firmware/controllers/actuators/idle_hardware.cpp
@@ -159,21 +159,28 @@ void initIdleHardware(Logging* sharedLogger DECLARE_ENGINE_PARAMETER_SUFFIX) {
 
 		// This greatly improves PID accuracy for steppers with a small number of steps
 		idlePositionSensitivityThreshold = 1.0f / engineConfiguration->idleStepperTotalSteps;
-	} else if (!engineConfiguration->useETBforIdleControl) {
+	} else if (engineConfiguration->useETBforIdleControl || CONFIG(idle).solenoidPin == GPIO_UNASSIGNED) {
+		// here we do nothing for ETB idle and for no idle
+	} else {
+		// we are here for single or double solenoid idle
+
 		/**
 		 * Start PWM for idleValvePin
 		 */
 		// todo: even for double-solenoid mode we can probably use same single SimplePWM
 		// todo: open question why do we pass 'OutputPin' into 'startSimplePwmExt' if we have custom applyIdleSolenoidPinState listener anyway?
-		if (CONFIG(idle).solenoidPin != GPIO_UNASSIGNED) {
-			startSimplePwm(&idleSolenoidOpen, "Idle Valve Open",
-				&engine->executor,
-				&enginePins.idleSolenoidPin,
-				CONFIG(idle).solenoidFrequency, PERCENT_TO_DUTY(CONFIG(manIdlePosition)),
-				(pwm_gen_callback*)applyIdleSolenoidPinState);
-		}
+		startSimplePwm(&idleSolenoidOpen, "Idle Valve Open",
+			&engine->executor,
+			&enginePins.idleSolenoidPin,
+			CONFIG(idle).solenoidFrequency, PERCENT_TO_DUTY(CONFIG(manIdlePosition)),
+			(pwm_gen_callback*)applyIdleSolenoidPinState);
+
+		if (CONFIG(isDoubleSolenoidIdle)) {
+			if (CONFIG(secondSolenoidPin) == GPIO_UNASSIGNED) {
+				firmwareError(OBD_PCM_Processor_Fault, "Second idle pin should be configured for double solenoid mode.");
+				return;
+			}
 
-		if (CONFIG(isDoubleSolenoidIdle) && CONFIG(secondSolenoidPin) != GPIO_UNASSIGNED) {
 			startSimplePwm(&idleSolenoidClose, "Idle Valve Close",
 				&engine->executor,
 				&enginePins.secondIdleSolenoidPin,