diff --git a/firmware/controllers/algo/defaults/default_fuel.cpp b/firmware/controllers/algo/defaults/default_fuel.cpp
index 94a04827c9..80e8583ae5 100644
--- a/firmware/controllers/algo/defaults/default_fuel.cpp
+++ b/firmware/controllers/algo/defaults/default_fuel.cpp
@@ -195,14 +195,13 @@ static void setMazdaMiataNbTpsTps() {
 }
 
 static void setDefaultLambdaTable() {
-#if (FUEL_LOAD_COUNT == DEFAULT_FUEL_LOAD_COUNT)
+	setRpmTableBin(config->lambdaRpmBins);
+
+#if (FUEL_LOAD_COUNT == DEFAULT_FUEL_LOAD_COUNT) && (FUEL_RPM_COUNT == DEFAULT_FUEL_LOAD_COUNT)
 	static constexpr float mapBins[] = {
 		30, 40, 50, 60, 70, 80, 90, 100, 110, 120, 130, 150, 175, 200, 225, 250
 	};
 	copyArray(config->lambdaLoadBins, mapBins);
-#endif
-
-	setRpmTableBin(config->lambdaRpmBins);
 
 	static constexpr float rowValues[] = {
 		1,		1,		1,		1,		// 30, 40, 50, 60 kpa
@@ -217,6 +216,7 @@ static void setDefaultLambdaTable() {
 			config->lambdaTable[i][j] = rowValues[i];
 		}
 	}
+#endif
 }
 
 void setGdiWallWetting() {