Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -ra997e6d608a9970a948bda978dade1148269ff90 -r67b1208c4d62d55d66672a18b7a69d025d0110c2
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision a997e6d608a9970a948bda978dade1148269ff90)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 67b1208c4d62d55d66672a18b7a69d025d0110c2)
@@ -479,7 +479,7 @@
         additionalRinsebackRequested = FALSE;
         // deliver additional rinseback volume only if max volume not reached and max time not reached
         if ( ( ( cumulativeRinsebackVolume_mL + TARGET_ADDITIONAL_RINSEBACK_VOLUME_ML ) <=  MAX_TOTAL_RINSEBACK_VOLUME_ML ) &&
-             ( rinsebackTimerCtr < MAX_RINSEBACK_TIME ) )
+             ( ( rinsebackTimerCtr < MAX_RINSEBACK_TIME ) || ( cumulativeRinsebackVolume_mL >= TARGET_RINSEBACK_VOLUME_ML ) ) )
         {
             rinsebackAdditionalTimerCtr = 0;
             additionalRinsebackVolume_mL = 0.0;