Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r6af31d047bdeb79e6bdb97fc9fd7433a70e9de74 -rf4199248340b66e66abbe99599d5d30ce980ea5f
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 6af31d047bdeb79e6bdb97fc9fd7433a70e9de74)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision f4199248340b66e66abbe99599d5d30ce980ea5f)
@@ -23,10 +23,14 @@
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
 #include "Dialysis.h"
+#include "ModePostTreat.h"
+#include "ModePreTreat.h"
+#include "ModeStandby.h"
+#include "ModeTreatment.h"
+#include "ModeTreatmentParams.h"
 #include "OperationModes.h"
 #include "SystemComm.h"
 #include "SystemCommMessages.h"
-#include "ModeStandby.h"
 #ifdef EMC_TEST_BUILD     // TODO - test code
 #include "FPGA.h"
 #endif
@@ -120,6 +124,12 @@
         case STANDBY_WAIT_FOR_TREATMENT_STATE:
             if ( TRUE == treatStartReqReceived )
             {
+                // Initialize treatment modes before starting a new treatment
+                initTreatParamsMode();
+                initPreTreatmentMode();
+                initTreatmentMode();
+                initPostTreatmentMode();
+                // Start treatment workflow with treatment parameters mode
                 requestNewOperationMode( MODE_TPAR );
                 treatStartReqReceived = FALSE;
             }