Index: sources/drydemo/StateControllerStandby.cpp
===================================================================
diff -u -rbf271a558491a83b39eb30748784f1b744736dd2 -r4d0fc455e6307639e72db490721c7768a487c014
--- sources/drydemo/StateControllerStandby.cpp	(.../StateControllerStandby.cpp)	(revision bf271a558491a83b39eb30748784f1b744736dd2)
+++ sources/drydemo/StateControllerStandby.cpp	(.../StateControllerStandby.cpp)	(revision 4d0fc455e6307639e72db490721c7768a487c014)
@@ -164,7 +164,7 @@
     switch (userAction) {
         case ALARM_USER_ACTION_RESUME:
             // If we are in treatment pause return back to treatment, otherwise just clear the alarm
-            if (isFromTxPause) {
+            if (isFromTxPause && _treatmentStatus.bicartAction == DRY_BICART_ACTION_DONE) {
                 _treatmentSubStates.dialysisSubState  = DIALYSIS_UF_STATE;
                 _treatmentSubStates.txState           = TREAT_DIALYSIS_STATE;
                 _treatmentStatus.stateTransitionEvent = "T_TP_2_Tx";
@@ -247,8 +247,7 @@
             break;
 
         case SEQ_ALARM_DRY_BICARB_CARTRIDGE:
-            //if (_treatmentStatus.activeTopAlarm != ALARM_ID_NO_ALARM) { triggerAnAlarm(ALARM_ID_NO_ALARM); return; }
-            triggerAnAlarm(ALARM_ID_DD_BICARBONATE_CARTRIDGE_LOW_LEVEL);
+            if (_treatmentStatus.activeTopAlarm != ALARM_ID_DD_BICARBONATE_CARTRIDGE_LOW_LEVEL) { triggerAnAlarm(ALARM_ID_DD_BICARBONATE_CARTRIDGE_LOW_LEVEL); return; }
             // Set the bicart screen to start draining automatically
             _treatmentStatus.bicartDrainInProgress  = DRY_BICART_DRIN_IN_PROGRESS;
             _treatmentStatus.bicartProgress         = 0;