diff --git a/firmware/CHANGELOG.md b/firmware/CHANGELOG.md
index 9f38be0e1c..ed7a23da10 100644
--- a/firmware/CHANGELOG.md
+++ b/firmware/CHANGELOG.md
@@ -39,6 +39,7 @@ or
 
 ### Fixed
  - Improve performance with Lua CAN reception of a high volume of frames
+ - Displayed units in TunerStudio change when switching between volume vs. mass injector flow modes #42
 
 ## December 2023 Release
 
diff --git a/firmware/integration/rusefi_config.txt b/firmware/integration/rusefi_config.txt
index 42996eb40c..2e154aab1e 100644
--- a/firmware/integration/rusefi_config.txt
+++ b/firmware/integration/rusefi_config.txt
@@ -392,7 +392,7 @@ custom can_nbc_e 1 bits, U08, @OFFSET@, [0:4], "None", "FIAT", "VAG", "MAZDA RX8
 can_nbc_e canNbcType
 
 struct injector_s
-	float flow;This is your injector flow at the fuel pressure used in the vehicle. cc/min, cubic centimetre per minute\nBy the way, g/s = 0.125997881 * (lb/hr)\ng/s = 0.125997881 * (cc/min)/10.5\ng/s = 0.0119997981 * cc/min;"cm3/min", 1, 0, 0, 99999, 2
+	float flow;This is your injector flow at the fuel pressure used in the vehicle. cc/min;"", 1, 0, 0, 99999, 2
 	uint16_t[VBAT_INJECTOR_CURVE_SIZE] autoscale battLagCorrBins;;"volts", 0.01, 0, 0, 20, 2
 	uint16_t[VBAT_INJECTOR_CURVE_SIZE] autoscale battLagCorr;ms delay between injector open and close dead times;"ms", 0.01, 0, 0, 50, 2
 end_struct
@@ -684,7 +684,7 @@ pin_input_mode_e throttlePedalUpPinMode;
 
 	Gpio[TRIGGER_SIMULATOR_PIN_COUNT iterate] triggerSimulatorPins;Generate a synthetic trigger signal for an external ECU
 
-	uint16_t autoscale fordInjectorSmallPulseSlope;;"g/s", 0.001, 0, 0, 65, 3
+	uint16_t autoscale fordInjectorSmallPulseSlope;;"", 0.001, 0, 0, 65, 3
 
 	uint8_t autoscale lambdaProtectionMinRpm;;"RPM", 100, 0, 0, 25000, 0
 	uint8_t autoscale lambdaProtectionMinLoad;;"%", 10, 0, 0, 1000, 0
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index 9397d2358c..9c1e1bf86d 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -2358,15 +2358,16 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
 
 ;			Engine->Injection Settings
 	dialog = injChars, "Injector Settings",	yAxis
-		field = "Injector flow",			injector_flow, {isInjectionEnabled == 1}
-		field = "Injector flow units",		injectorFlowAsMassFlow, {isInjectionEnabled == 1}
+		field = "Injector flow(cc/min)",		injector_flow, {isInjectionEnabled}, {!injectorFlowAsMassFlow}
+		field = "Injector flow(g/s)",			injector_flow, {isInjectionEnabled}, {injectorFlowAsMassFlow}
+		field = "Injector flow units",		injectorFlowAsMassFlow, {isInjectionEnabled}
 		field = "Fuel rail pressure sensor", injectorPressureType, { isInjectionEnabled && (highPressureFuel_hwChannel || lowPressureFuel_hwChannel) }
 		field = "Injector flow compensation mode", injectorCompensationMode, { isInjectionEnabled }
 		field = "Injector reference pressure", fuelReferencePressure, { isInjectionEnabled && injectorCompensationMode != 0 }
 
 	dialog = fuelParams, "Fuel characteristics", yAxis
-		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled == 1}
-		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled == 1 && flexSensorPin != 0 }
+		field = "Stoichiometric ratio",			stoichRatioPrimary, {isInjectionEnabled}
+		field = "E100 stoichiometric ratio",	stoichRatioSecondary, {isInjectionEnabled && flexSensorPin != 0 }
 
 	dialog = injectorPins, "Injector Outputs",	yAxis
 		field = "Use only first half of outputs for batch mode"
@@ -2411,9 +2412,9 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
 		field = "x^7",								injectorCorrectionPolynomial8
 
 	dialog = injectorNonlinearFord, "Ford-model Small Pulse Correction", yAxis
-		field = "Small pulse slope (ALOSL)",			fordInjectorSmallPulseSlope
+		field = "Small pulse slope (ALOSL, g/s)",			fordInjectorSmallPulseSlope
 		field = "Set this to 'mass flow'",				injectorFlowAsMassFlow
-		field = "Large pulse slope (AHISL)",			injector_flow
+		field = "Large pulse slope (AHISL, g/s)",			injector_flow
 		field = "Small pulse breakpoint (FUEL_BKPT)",	fordInjectorSmallPulseBreakPoint
 
 	dialog = injectorNonlinear
@@ -2488,7 +2489,8 @@ cmd_set_engine_type_default					= "@@TS_IO_TEST_COMMAND_char@@@@ts_command_e_TS_
 	dialog = stagedInjection, "",	yAxis
 		field = "Enable", enableStagedInjection, {isInjectionEnabled}
 		field = ""
-		field = "Secondary injector flow", injectorSecondary_flow {isInjectionEnabled && enableStagedInjection}
+		field = "Secondary injector flow(cc/min)",	injectorSecondary_flow, {isInjectionEnabled && enableStagedInjection}, {!injectorFlowAsMassFlow}
+		field = "Secondary injector flow(g/s)",		injectorSecondary_flow, {isInjectionEnabled && enableStagedInjection}, {injectorFlowAsMassFlow}
 		field = ""
 		panel = injectorsSecondaryDeadTime, {isInjectionEnabled && enableStagedInjection}