Index: firmware/App/Modes/Rinseback.c
===================================================================
diff -u -r49533d4870aa10c1b20406dd5c013567fe854694 -rdbf9c245d46c7536c72d277da24f7b44d7a84118
--- firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision 49533d4870aa10c1b20406dd5c013567fe854694)
+++ firmware/App/Modes/Rinseback.c	(.../Rinseback.c)	(revision dbf9c245d46c7536c72d277da24f7b44d7a84118)
@@ -498,14 +498,14 @@
         activateAlarmNoData( ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM );
     }
     // Have we been in this stopped state for too long despite having delivered full blood volume back to patient?
-    else if ( ( rinsebackTimerCtr > MAX_RINSEBACK_DONE_TIME ) && ( getRinsebackVolume() >= rinsebackTargetVolume_mL ) )
+    else if ( ( rinsebackTimerCtr > MAX_RINSEBACK_DONE_TIME ) /*&& ( getRinsebackVolume() >= rinsebackTargetVolume_mL )*/ ) // Commented out the second condition because the done time > max rinse back time
     {
         signalGoToTreatmentStopped();
         activateAlarmNoData( ALARM_ID_TREATMENT_RINSEBACK_TIMEOUT_ALARM );
         clearAlarm( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING );
     }
     // Have we been in this stopped state for too long despite having delivered full blood volume back to patient?
-    else if ( ( RINSEBACK_DONE_WARNING_TIME == rinsebackTimerCtr ) && ( getRinsebackVolume() >= rinsebackTargetVolume_mL ) )
+    else if ( ( RINSEBACK_DONE_WARNING_TIME == rinsebackTimerCtr ) /*&& ( getRinsebackVolume() >= rinsebackTargetVolume_mL )*/ ) // Commented out the second condition because the warning time > max rinse back time
     {
         activateAlarmNoData( ALARM_ID_HD_TREATMENT_RINSEBACK_TIMEOUT_WARNING );
     }