diff --git a/firmware/controllers/engine_controller.cpp b/firmware/controllers/engine_controller.cpp
index b8b72da0af..b8e1ecd548 100644
--- a/firmware/controllers/engine_controller.cpp
+++ b/firmware/controllers/engine_controller.cpp
@@ -255,6 +255,17 @@ static void resetAccel(void) {
 	}
 }
 
+void onStartStopButtonToggle(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
+	engine->startStopStateToggleCounter++;
+
+	if (engine->rpmCalculator.isStopped(PASS_ENGINE_PARAMETER_SIGNATURE)) {
+		engine->startStopStateLastPushTime = getTimeNowNt();
+	} else if (engine->rpmCalculator.isRunning(PASS_ENGINE_PARAMETER_SIGNATURE)) {
+		// todo: request engine stop here
+	}
+
+}
+
 static void slowStartStopButtonCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	if (CONFIG(startStopButtonPin) != GPIO_UNASSIGNED) {
 #if EFI_PROD_CODE
@@ -262,11 +273,24 @@ static void slowStartStopButtonCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 
 		if (startStopState && !engine->startStopState) {
 			// we are here on transition from 0 to 1
-			engine->startStopStateToggleCounter++;
+			onStartStopButtonToggle(PASS_ENGINE_PARAMETER_SIGNATURE);
 		}
 		engine->startStopState = startStopState;
 #endif /* EFI_PROD_CODE */
 	}
+
+	// todo: should this be simply FSIO?
+	if (engine->rpmCalculator.isRunning(PASS_ENGINE_PARAMETER_SIGNATURE)) {
+		// turn starter off once engine is running
+		enginePins.starterControl.setValue(0);
+		engine->startStopStateLastPushTime = 0;
+	}
+
+	if (engine->startStopStateLastPushTime != 0 &&
+			getTimeNowNt() - engine->startStopStateLastPushTime > NT_PER_SECOND * CONFIG(startCrankingDuration)) {
+		enginePins.starterControl.setValue(0);
+		engine->startStopStateLastPushTime = 0;
+	}
 }
 
 static void doPeriodicSlowCallback(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
diff --git a/firmware/controllers/engine_controller.h b/firmware/controllers/engine_controller.h
index dc7469b844..4fa947f197 100644
--- a/firmware/controllers/engine_controller.h
+++ b/firmware/controllers/engine_controller.h
@@ -18,6 +18,8 @@ void commonInitEngineController(Logging *sharedLogger DECLARE_ENGINE_PARAMETER_S
 void initDataStructures(DECLARE_ENGINE_PARAMETER_SIGNATURE);
 void touchTimeCounter();
 
+void onStartStopButtonToggle(DECLARE_ENGINE_PARAMETER_SIGNATURE);
+
 #if EFI_ENABLE_MOCK_ADC
 void setMockVoltage(int hwChannel, float voltage DECLARE_ENGINE_PARAMETER_SUFFIX);
 #endif
diff --git a/firmware/controllers/system/efi_gpio.cpp b/firmware/controllers/system/efi_gpio.cpp
index 5b7c534673..621dc49993 100644
--- a/firmware/controllers/system/efi_gpio.cpp
+++ b/firmware/controllers/system/efi_gpio.cpp
@@ -148,7 +148,7 @@ void EnginePins::unregisterPins() {
 	unregisterOutputIfPinOrModeChanged(mainRelay, mainRelayPin, mainRelayPinMode);
 	unregisterOutputIfPinOrModeChanged(starterRelayDisable, starterRelayDisablePin, starterRelayDisableMode);
 
-	unregisterOutputIfPinChanged(starterControl, starterControlPin, starterRelayDisableMode);
+	unregisterOutputIfPinChanged(starterControl, starterControlPin);
 
 #endif /* EFI_PROD_CODE */
 }