diff --git a/firmware/controllers/algo/engine.h b/firmware/controllers/algo/engine.h
index 6b897015fc..6048288821 100644
--- a/firmware/controllers/algo/engine.h
+++ b/firmware/controllers/algo/engine.h
@@ -234,6 +234,10 @@ public:
 	 * this is based on sensorChartMode and sensorSnifferRpmThreshold settings
 	 */
 	sensor_chart_e sensorChartMode;
+	/**
+	 * based on current RPM and isAlternatorControlEnabled setting
+	 */
+	bool isAlternatorControlEnabled;
 
 	RpmCalculator rpmCalculator;
 	persistent_config_s *config;
diff --git a/firmware/controllers/alternatorController.cpp b/firmware/controllers/alternatorController.cpp
index 708d0adb8c..479c919e16 100644
--- a/firmware/controllers/alternatorController.cpp
+++ b/firmware/controllers/alternatorController.cpp
@@ -53,6 +53,16 @@ static msg_t AltCtrlThread(int param) {
 		int dt = maxI(10, engineConfiguration->alternatorDT);
 		chThdSleepMilliseconds(dt);
 
+		// todo: migrate this to FSIO
+		bool alternatorShouldBeEnabledAtCurrentRpm = engine->rpmCalculator.rpmValue > 400;
+		engine->isAlternatorControlEnabled = CONFIG(isAlternatorControlEnabled) && alternatorShouldBeEnabledAtCurrentRpm;
+
+		if (!engine->isAlternatorControlEnabled) {
+			// we need to avoid accumulating iTerm while engine is not spinning
+			altPid.reset();
+			continue;
+		}
+
 		currentAltDuty = engineConfiguration->alternatorOffset + altPid.getValue(engineConfiguration->targetVBatt, getVBatt(PASS_ENGINE_PARAMETER_F), 1);
 		if (boardConfiguration->isVerboseAlternator) {
 			scheduleMsg(logger, "alt duty: %f/vbatt=%f/p=%f/i=%f/d=%f int=%f", currentAltDuty, getVBatt(PASS_ENGINE_PARAMETER_F),
@@ -95,7 +105,7 @@ static void applyAlternatorPinState(PwmConfig *state, int stateIndex) {
 	efiAssertVoid(state->multiWave.waveCount == 1, "invalid idle waveCount");
 	OutputPin *output = state->outputPins[0];
 	int value = state->multiWave.waves[0].pinStates[stateIndex];
-	if (!value || engineConfiguration->isAlternatorControlEnabled)
+	if (!value || engine->isAlternatorControlEnabled)
 		output->setValue(value);
 }