Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -rcc4f8440e8ad7fa8f2ced2467d922be7422c344c -r3db5538afb80bc12822304d698343e0325fa708e
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision cc4f8440e8ad7fa8f2ced2467d922be7422c344c)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 3db5538afb80bc12822304d698343e0325fa708e)
@@ -402,13 +402,17 @@
         result = RINSEBACK_PAUSED_STATE;
     }
     // Is rinseback taking too long?
-    else if ( ( fabs( expectedRinsebackVolume_mL - getRinsebackVolume() ) > MAX_RINSEBACK_VOLUME_ERROR_ML ) &&
-              ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE ) )
+    else if ( fabs( expectedRinsebackVolume_mL - getRinsebackVolume() ) > MAX_RINSEBACK_VOLUME_ERROR_ML )
     {
-        setRinsebackIsCompleted( TRUE );
-        setupForRinsebackStopOrPause();
-        activateAlarmNoData( ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE );
-        result = RINSEBACK_STOP_STATE;
+#ifndef _RELEASE_
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_PUMP_FLOW_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
+#endif
+        {
+            setRinsebackIsCompleted( TRUE );
+            setupForRinsebackStopOrPause();
+            activateAlarmNoData( ALARM_ID_RINSEBACK_VOLUME_CHECK_FAILURE );
+            result = RINSEBACK_STOP_STATE;
+        }
     }
     // Otherwise, continue rinseback
     else