Index: sources/drydemo/StateControllerStandby.cpp
===================================================================
diff -u -r521f29cb7dcd0de352dd744292488380e07cb9e3 -re8edefcae8e47854198b06c1a65e4e45da5f3afc
--- sources/drydemo/StateControllerStandby.cpp	(.../StateControllerStandby.cpp)	(revision 521f29cb7dcd0de352dd744292488380e07cb9e3)
+++ sources/drydemo/StateControllerStandby.cpp	(.../StateControllerStandby.cpp)	(revision e8edefcae8e47854198b06c1a65e4e45da5f3afc)
@@ -106,6 +106,8 @@
     _treatmentStatus.isBloodPumpRunning         = false;
     _treatmentStatus.txPauseSeqAlarmState       = SEQ_ALARM_NO_ALARM;
     _treatmentStatus.txPauseBloodSittingCounter = 0;
+    _treatmentStatus.isRecircAllowed            = true;
+    _treatmentStatus.isDialysateInBypass        = false;
     // Initialize alarm varibales to be alarm no alarm
     _treatmentStatus.activeTopAlarm             = ALARM_ID_NO_ALARM;
     _treatmentStatus.activeAlarmProperty        = _alarmTriggerSpecs[ALARM_ID_NO_ALARM][ALARM_TABLE_PROPERTIES_INDEX].toInt();
@@ -202,6 +204,8 @@
 
         case ALARM_USER_ACTION_RINSEBACK:
             handleSendUIConfirmationMessage(GENERIC_CONFIRM_ID_RINSEBACK, GENERIC_CONFIRM_CMD_REQUEST_OPEN);
+            // Recirculation is not allowed in rinseback
+            _treatmentStatus.isRecircAllowed = false;
             break;
 
         case ALARM_USER_ACTION_TEMPOARY_BREAK:
@@ -211,6 +215,8 @@
         case ALARM_USER_ACTION_END_TREATMENT:
             handleSendUIConfirmationMessage(GENERIC_CONFIRM_ID_TREATMENT_END, GENERIC_CONFIRM_CMD_REQUEST_OPEN);
             _treatmentStatus.stateTransitionEvent = "T_TP_2_RB";
+            // Recirculation is not allowed in end treatment option
+            _treatmentStatus.isRecircAllowed      = false;
             break;
 
         default:
@@ -352,6 +358,8 @@
                 else if (activeState == "Treatment_Rinseback") { _treatmentStatus.stateTransitionEvent = "T_RB_2_Posttx"; }
                 else if (activeState == "Treatment_End")       { _treatmentStatus.stateTransitionEvent = "T_TE_2_RB";     }
                 else if (activeState == "Treatment_Pause")     { _treatmentStatus.stateTransitionEvent = "T_TP_2_RB";     }
+                // Reciculation is not allowed in end treatment
+                _treatmentStatus.isRecircAllowed            = false;
                 _uiConfirmMessages[confirmID].confirmStatus = CONFIRMATION_REQUEST_STATUS_UNUSED;
                 status                                      = STATE_ON_EXIT;
                 qDebug() << "Event" << activeState << _treatmentStatus.stateTransitionEvent << _dryDemo.activeStateNames(true);