Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -ra069eb423b26296eb95214e18383c81adae07497 -r46c6c0c0967b279e4a5ad1eb501b526812704248
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a069eb423b26296eb95214e18383c81adae07497)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 46c6c0c0967b279e4a5ad1eb501b526812704248)
@@ -737,9 +737,13 @@
     DG_BICARB_CONCENTRATES_RECORD_T bicarb = getBicarbConcentrateCalRecord();
 
     // Set concentrate pumps speed based off RO pump flow rate
-    F32 const acidCP1PumpFlowRate = acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidConcMixRatio * measuredROFlowRate_mL_min;
-    F32 const bicarbCP2PumpFlowRate = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio * measuredROFlowRate_mL_min;
+    F32 acidCP1PumpFlowRate   = acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidConcMixRatio * measuredROFlowRate_mL_min;
+    F32 bicarbCP2PumpFlowRate = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio * measuredROFlowRate_mL_min;
 
+    // Cap to the maximum allowed concentrate pumps rate
+    acidCP1PumpFlowRate   = MIN( acidCP1PumpFlowRate, CONCENTRATE_PUMP_MAX_SPEED );
+    bicarbCP2PumpFlowRate = MIN( bicarbCP2PumpFlowRate, CONCENTRATE_PUMP_MAX_SPEED );
+
     setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, acidCP1PumpFlowRate );
     setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, bicarbCP2PumpFlowRate );
 #endif