diff --git a/firmware/controllers/actuators/idle_thread.cpp b/firmware/controllers/actuators/idle_thread.cpp
index 80d720b84d..c87e312682 100644
--- a/firmware/controllers/actuators/idle_thread.cpp
+++ b/firmware/controllers/actuators/idle_thread.cpp
@@ -82,13 +82,13 @@ public:
 	Engine *engine = unitTestEngine;
 	EXPAND_Engine;
 #endif
-
+		float result = parameters->offset;
 #if EFI_FSIO
 			if (engineConfiguration->useFSIO12ForIdleOffset) {
-				return ENGINE(fsioState.fsioIdleOffset);
+				return result + ENGINE(fsioState.fsioIdleOffset);
 			}
 #endif /* EFI_FSIO */
-		return parameters->offset;
+		return result;
 	}
 
 	float getMinValue() const override {
@@ -96,23 +96,27 @@ public:
 	Engine *engine = unitTestEngine;
 	EXPAND_Engine;
 #endif
+	float result = parameters->minValue;
 #if EFI_FSIO
 			if (engineConfiguration->useFSIO13ForIdleMinValue) {
-				return ENGINE(fsioState.fsioIdleMinValue);
+				return result + ENGINE(fsioState.fsioIdleMinValue);
 			}
 #endif /* EFI_FSIO */
-		return parameters->minValue;
+		return result;
 	}
 };
 
 PidWithOverrides idlePid;
 #endif /* EFI_IDLE_PID_CIC */
 
-
 float getIdlePidOffset() {
 	return idlePid.getOffset();
 }
 
+float getIdlePidMinValue() {
+	return idlePid.getMinValue();
+}
+
 // todo: extract interface for idle valve hardware, with solenoid and stepper implementations?
 static SimplePwm idleSolenoidOpen("idle open");
 static SimplePwm idleSolenoidClose("idle close");
diff --git a/firmware/controllers/actuators/idle_thread.h b/firmware/controllers/actuators/idle_thread.h
index 05ed33acd0..ee4b6c4668 100644
--- a/firmware/controllers/actuators/idle_thread.h
+++ b/firmware/controllers/actuators/idle_thread.h
@@ -37,3 +37,4 @@ void initIdleHardware(DECLARE_ENGINE_PARAMETER_SIGNATURE);
 bool isIdleHardwareRestartNeeded();
 void onConfigurationChangeIdleCallback(engine_configuration_s *previousConfiguration);
 float getIdlePidOffset();
+float getIdlePidMinValue();
diff --git a/unit_tests/tests/test_idle_controller.cpp b/unit_tests/tests/test_idle_controller.cpp
index d1e5d67dc7..93ade39796 100644
--- a/unit_tests/tests/test_idle_controller.cpp
+++ b/unit_tests/tests/test_idle_controller.cpp
@@ -27,16 +27,16 @@ TEST(idle, fsioPidParameters) {
 	unitTestEngine = engine;
 
 	engineConfiguration->idleRpmPid.offset = 40;
-	engineConfiguration->idleRpmPid2.offset = 50;
+	engineConfiguration->acIdleExtraOffset = 10;
 
 	engineConfiguration->idleRpmPid.minValue = 30;
-	engineConfiguration->idleRpmPid2.minValue = 60;
+	engineConfiguration->acIdleExtraMin = 30;
 
 	engineConfiguration->useFSIO12ForIdleOffset = true;
-	setFsioExpression(QUOTE(MAGIC_OFFSET_FOR_IDLE_OFFSET), "ac_on_switch cfg_idleRpmPid_offset cfg_idleRpmPid2_offset if" PASS_ENGINE_PARAMETER_SUFFIX);
+	setFsioExpression(QUOTE(MAGIC_OFFSET_FOR_IDLE_OFFSET), "ac_on_switch 0 cfg_acIdleExtraOffset if" PASS_ENGINE_PARAMETER_SUFFIX);
 
 	engineConfiguration->useFSIO13ForIdleMinValue = true;
-	setFsioExpression(QUOTE(MAGIC_OFFSET_FOR_IDLE_MIN_VALUE), "ac_on_switch cfg_idleRpmPid_minValue cfg_idleRpmPid2_minValue if" PASS_ENGINE_PARAMETER_SUFFIX);
+	setFsioExpression(QUOTE(MAGIC_OFFSET_FOR_IDLE_MIN_VALUE), "ac_on_switch 0 cfg_acIdleExtraMin if" PASS_ENGINE_PARAMETER_SUFFIX);
 
 	ASSERT_EQ(1, hasAcToggle(PASS_ENGINE_PARAMETER_SIGNATURE));
 	setMockVoltage(engineConfiguration->acSwitchAdc, 0 PASS_ENGINE_PARAMETER_SUFFIX);
@@ -44,14 +44,14 @@ TEST(idle, fsioPidParameters) {
 
 	eth.engine.periodicSlowCallback(PASS_ENGINE_PARAMETER_SIGNATURE);
 	ASSERT_EQ(40, getIdlePidOffset());
-	ASSERT_EQ(30, ENGINE(fsioState.fsioIdleMinValue));
+	ASSERT_EQ(30, getIdlePidMinValue());
 
 	setMockVoltage(engineConfiguration->acSwitchAdc, 5 PASS_ENGINE_PARAMETER_SUFFIX);
 	ASSERT_EQ(0, getAcToggle(PASS_ENGINE_PARAMETER_SIGNATURE));
 
 	eth.engine.periodicSlowCallback(PASS_ENGINE_PARAMETER_SIGNATURE);
 	ASSERT_EQ(50, getIdlePidOffset());
-	ASSERT_EQ(60, ENGINE(fsioState.fsioIdleMinValue));
+	ASSERT_EQ(60, getIdlePidMinValue());
 
 
 	// todo finish this unit test!