diff --git a/firmware/controllers/actuators/electronic_throttle.cpp b/firmware/controllers/actuators/electronic_throttle.cpp
index 895c0db352..89452ba240 100644
--- a/firmware/controllers/actuators/electronic_throttle.cpp
+++ b/firmware/controllers/actuators/electronic_throttle.cpp
@@ -367,12 +367,12 @@ percent_t EtbController2::getThrottleTrim(float /*rpm*/, percent_t /*targetPosit
 }
 
 expected<percent_t> EtbController::getOpenLoop(percent_t target) {
-	etbFeedForward = 0;
-
 	// Don't apply open loop for wastegate/idle valve, only real ETB
 	if (m_function != ETB_Wastegate
 		&& m_function != ETB_IdleValve) {
 		etbFeedForward = interpolate2d(target, config->etbBiasBins, config->etbBiasValues);
+	} else {
+	    etbFeedForward = 0;
 	}
 
 	return etbFeedForward;