Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r11b0015549d4371fa2ad4314c17567712a36a564
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 11b0015549d4371fa2ad4314c17567712a36a564)
@@ -1248,7 +1248,7 @@
     BOOL const isRunningMCCurrentBad = ( ( BLOOD_PUMP_OFF_STATE != bloodPumpState ) && ( bpCurr > BP_MAX_CURR_WHEN_RUNNING_MA ) ? TRUE : FALSE );
 
     if ( ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK, isOffMCCurrentBad || isRunningMCCurrentBad ) ) &&
-         ( FALSE == isAlarmActive( ALARM_ID_HD_AC_POWER_LOST ) ) )
+         ( FALSE == isAlarmActive( ALARM_ID_HD_AC_POWER_LOST ) ) && ( FALSE == isAlarmActive( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT ) ) )
     {
 #ifndef _RELEASE_
         if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_MOTOR_CURRNT_CHECKS ) != SW_CONFIG_ENABLE_VALUE )
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r775f8ad98cccfd06d712ab339d1d88e3e640803c -r11b0015549d4371fa2ad4314c17567712a36a564
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 775f8ad98cccfd06d712ab339d1d88e3e640803c)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 11b0015549d4371fa2ad4314c17567712a36a564)
@@ -1432,7 +1432,7 @@
 {
     F32 dipCurr;
 
-    if ( FALSE == isAlarmActive( ALARM_ID_HD_AC_POWER_LOST ) )
+    if ( ( FALSE == isAlarmActive( ALARM_ID_HD_AC_POWER_LOST ) ) && ( FALSE == isAlarmActive( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT ) ) )
     {
         // DialIn pump should be off
         if ( DIAL_IN_PUMP_OFF_STATE == dialInPumpState )
Index: firmware/App/Controllers/DialOutFlow.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r11b0015549d4371fa2ad4314c17567712a36a564
--- firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Controllers/DialOutFlow.c	(.../DialOutFlow.c)	(revision 11b0015549d4371fa2ad4314c17567712a36a564)
@@ -1134,7 +1134,7 @@
 {
     F32 dopCurr;
 
-    if ( FALSE == isAlarmActive( ALARM_ID_HD_AC_POWER_LOST ) )
+    if ( ( FALSE == isAlarmActive( ALARM_ID_HD_AC_POWER_LOST ) ) && ( FALSE == isAlarmActive( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT ) ) )
     {
         // DialOut pump should be off
         if ( DIAL_OUT_PUMP_OFF_STATE == dialOutPumpState )
Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -r0a4dcd288d4347b85baaa0b07da568b6add5eac7 -r11b0015549d4371fa2ad4314c17567712a36a564
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 0a4dcd288d4347b85baaa0b07da568b6add5eac7)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 11b0015549d4371fa2ad4314c17567712a36a564)
@@ -635,6 +635,7 @@
                 else
                 {
                     clearAlarmCondition( ALARM_ID_HD_AC_POWER_LOST );
+                    clearAlarmCondition( ALARM_ID_HD_AC_POWER_LOST_IN_TREATMENT );
                 }
             }
             // Publish battery status data after reading battery charger status (last status read)