Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -r5b61b06231cc0d8266f59c3c1f891d650bc1ac12 -r36d4763e96993a67b1561686687ca06bbd2f724b
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 5b61b06231cc0d8266f59c3c1f891d650bc1ac12)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 36d4763e96993a67b1561686687ca06bbd2f724b)
@@ -210,6 +210,12 @@
             break;
     }
 
+    // Has max time waiting for user to initiate final rinseback been exceeded?
+    if ( txEndTimerCtr > TX_END_TIMEOUT_MS )
+    {
+        activateAlarmNoData( ALARM_ID_HD_END_TREATMENT_TIMEOUT_ALARM );
+    }
+
     if ( priorSubState != treatmentEndState )
     {
         setCurrentSubState( (U32)treatmentEndState );
@@ -272,11 +278,6 @@
     {
         signalGoToRinseback();
     }
-    // Has max time waiting for user to initiate final rinseback been exceeded?
-    else if ( txEndTimerCtr > TX_END_TIMEOUT_MS )
-    {
-        activateAlarmNoData( ALARM_ID_HD_END_TREATMENT_TIMEOUT_ALARM );
-    }
 
     return result;
 }