Index: firmware/App/Modes/TreatmentRecirc.c
===================================================================
diff -u -r3b39f06f17d13119fdac403902a805b4bd133f87 -r42d72cabecb7ab7698a4964f66cdfa672b298cf3
--- firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision 3b39f06f17d13119fdac403902a805b4bd133f87)
+++ firmware/App/Modes/TreatmentRecirc.c	(.../TreatmentRecirc.c)	(revision 42d72cabecb7ab7698a4964f66cdfa672b298cf3)
@@ -52,7 +52,7 @@
 static BOOL recircResumeRequested;                                          ///< Flag indicates user requesting resumption of re-circulating.
 static BOOL recircEndTreatmentRequested;                                    ///< Flag indicates user requesting end of treatment.
 static BOOL prevDialysateRecircBlocked;                                     ///< Flag indicates previous user stop dialysate recirculation condition
-static BOOL prevBloodRecircBlocked;                                         ///< Flag indicates previous user stop blood recirculation condition
+static BOOL prevUserStopAlarmActive;                                         ///< Flag indicates previous user stop condition
 
 // ********** private function prototypes **********
 
@@ -90,7 +90,8 @@
     recircPublishTimerCtr = 0;
     resetTreatmentRecircFlags();
     prevDialysateRecircBlocked = isDialysateRecircBlocked();
-    prevBloodRecircBlocked = isBloodRecircBlocked();
+    prevUserStopAlarmActive = isAlarmActive( ALARM_ID_HD_TREATMENT_STOPPED_BY_USER );
+;
 }
 
 /*********************************************************************//**
@@ -545,7 +546,7 @@
 static void checkTreatmentRecircOnOff( void )
 {
     BOOL dialysateRecircBlocked = isDialysateRecircBlocked();                                     // Flag indicates user stop dialysate recirculation condition
-    BOOL bloodRecircBlocked = isBloodRecircBlocked();                                             // Flag indicates user stop blood recirculation condition
+    BOOL userStopAlarmActive = isAlarmActive( ALARM_ID_HD_TREATMENT_STOPPED_BY_USER );            // indicates user stop condition
 
     // if there was any change
     if ( dialysateRecircBlocked != prevDialysateRecircBlocked )
@@ -562,13 +563,13 @@
         }
         prevDialysateRecircBlocked = dialysateRecircBlocked;
     }
-    if ( bloodRecircBlocked != prevBloodRecircBlocked )
+    if ( userStopAlarmActive != prevUserStopAlarmActive )
     {   // Stop recirc if blocked by alarm
-        if ( TRUE == bloodRecircBlocked )
+        if ( TRUE == userStopAlarmActive )
         {
             signalBloodPumpHardStop();
         } // Pump on/blood and valves dealt with in the state machine.
-        prevBloodRecircBlocked = bloodRecircBlocked;
+        prevUserStopAlarmActive = userStopAlarmActive;
     }
 }