diff --git a/firmware/controllers/algo/engine.cpp b/firmware/controllers/algo/engine.cpp
index 81f0108868..1d675a2db7 100644
--- a/firmware/controllers/algo/engine.cpp
+++ b/firmware/controllers/algo/engine.cpp
@@ -291,7 +291,7 @@ void Engine::updateSlowSensors() {
 	updateSwitchInputs();
 
 #if EFI_ENGINE_CONTROL
-	int rpm = GET_RPM();
+	int rpm = Sensor::getOrZero(SensorType::Rpm);
 	isEngineChartEnabled = engineConfiguration->isEngineChartEnabled && rpm < engineConfiguration->engineSnifferRpmThreshold;
 	sensorChartMode = rpm < engineConfiguration->sensorSnifferRpmThreshold ? engineConfiguration->sensorChartMode : SC_OFF;
 
@@ -441,7 +441,7 @@ void Engine::OnTriggerSynchronizationLost() {
 
 void Engine::OnTriggerInvalidIndex(int currentIndex) {
 	// let's not show a warning if we are just starting to spin
-	if (GET_RPM() != 0) {
+	if (Sensor::getOrZero(SensorType::Rpm) != 0) {
 		warning(CUSTOM_SYNC_ERROR, "sync error: index #%d above total size %d", currentIndex, triggerCentral.triggerShape.getSize());
 		triggerCentral.triggerState.setTriggerErrorState();
 	}
diff --git a/firmware/controllers/algo/engine2.cpp b/firmware/controllers/algo/engine2.cpp
index b7d0041199..1b98cc7e9d 100644
--- a/firmware/controllers/algo/engine2.cpp
+++ b/firmware/controllers/algo/engine2.cpp
@@ -234,7 +234,7 @@ void StartupFuelPumping::setPumpsCounter(int newValue) {
 }
 
 void StartupFuelPumping::update() {
-	if (GET_RPM() == 0) {
+	if (Sensor::getOrZero(SensorType::Rpm) == 0) {
 		bool isTpsAbove50 = Sensor::getOrZero(SensorType::DriverThrottleIntent) >= 50;
 
 		if (this->isTpsAbove50 != isTpsAbove50) {
diff --git a/unit_tests/tests/trigger/test_trigger_decoder.cpp b/unit_tests/tests/trigger/test_trigger_decoder.cpp
index f621851f89..02fc73b75a 100644
--- a/unit_tests/tests/trigger/test_trigger_decoder.cpp
+++ b/unit_tests/tests/trigger/test_trigger_decoder.cpp
@@ -251,7 +251,7 @@ TEST(misc, testStartupFuelPumping) {
 
 	StartupFuelPumping sf;
 
-	engine->rpmCalculator.mockRpm = 0;
+	Sensor::setMockValue(SensorType::Rpm, 0);
 
 	Sensor::setMockValue(SensorType::DriverThrottleIntent, 60);
 	sf.update();
@@ -264,12 +264,12 @@ TEST(misc, testStartupFuelPumping) {
 	sf.update();
 	ASSERT_EQ( 1,  sf.pumpsCounter) << "pc#3";
 
-	engine->rpmCalculator.mockRpm = 10;
+	Sensor::setMockValue(SensorType::Rpm, 10);
 	sf.update();
 	ASSERT_EQ( 0,  sf.pumpsCounter) << "pc#4";
 
 	Sensor::setMockValue(SensorType::DriverThrottleIntent, 70);
-	engine->rpmCalculator.mockRpm = 0;
+	Sensor::setMockValue(SensorType::Rpm,  0);
 	sf.update();
 	ASSERT_EQ( 1,  sf.pumpsCounter) << "pc#5";