Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -ra1452dc7f16d37db53930c3d73992098709d7915 -r9df373d768695a399a141d5224bff88bea4efff5
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a1452dc7f16d37db53930c3d73992098709d7915)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 9df373d768695a399a141d5224bff88bea4efff5)
@@ -258,9 +258,10 @@
     DG_FILL_MODE_STATE_T result = DG_FILL_MODE_STATE_BICARB_PUMP_CHECK;
     DG_BICARB_CONCENTRATES_RECORD_T bicarb = getBicarbConcentrateCalRecord();
     F32 const measuredROFlowRate_mL_min = getMeasuredROFlowRate() * ML_PER_LITER;
-    F32 const bicarbPumpFlowRate_mL_min = measuredROFlowRate_mL_min * bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio +
+    F32       bicarbPumpFlowRate_mL_min = measuredROFlowRate_mL_min * bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio +
                                           CONCENTRATE_PUMP_PRIME_EXTRA_SPEED_ML_MIN;
 
+    bicarbPumpFlowRate_mL_min = MIN( bicarbPumpFlowRate_mL_min, CONCENTRATE_PUMP_MAX_SPEED );
 #ifndef DISABLE_DIALYSATE_CHECK
     F32 const bicarbConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
 #else
@@ -313,9 +314,10 @@
     DG_FILL_MODE_STATE_T result = DG_FILL_MODE_STATE_ACID_PUMP_CHECK;
     DG_ACID_CONCENTRATES_RECORD_T acid = getAcidConcentrateCalRecord();
     F32 const measuredROFlowRate_mL_min = getMeasuredROFlowRate() * ML_PER_LITER;
-    F32 const acidPumpFlowRate_mL_min = measuredROFlowRate_mL_min * acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidConcMixRatio +
+    F32       acidPumpFlowRate_mL_min = measuredROFlowRate_mL_min * acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidConcMixRatio +
                                         CONCENTRATE_PUMP_PRIME_EXTRA_SPEED_ML_MIN;
 
+    acidPumpFlowRate_mL_min = MIN( acidPumpFlowRate_mL_min, CONCENTRATE_PUMP_MAX_SPEED );
 #ifndef DISABLE_DIALYSATE_CHECK
     F32 const acidConductivity = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
 #else