Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -rb03a3ed91ebe15cfb419e34018f8fe600e744b4b -rd33ae635eb38ae8f2647f68304be74e8e4f78cfd
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision b03a3ed91ebe15cfb419e34018f8fe600e744b4b)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision d33ae635eb38ae8f2647f68304be74e8e4f78cfd)
@@ -402,7 +402,8 @@
     }
 #ifndef DISABLE_PUMP_FLOW_CHECKS
     // Is rinseback taking too long?
-    else if ( fabs( expectedRinsebackVolume_mL - getRinsebackVolume() ) > MAX_RINSEBACK_VOLUME_ERROR_ML )
+    else if ( ( fabs( expectedRinsebackVolume_mL - getRinsebackVolume() ) > MAX_RINSEBACK_VOLUME_ERROR_ML ) &&
+              ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
     {
         setRinsebackIsCompleted( TRUE );
         setupForRinsebackStopOrPause();