Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rda7e8c1b71db9273f83e9d0ba7d20e74e758a8ad -ra57994f752662abc0aaa8c2cf5c3af47ec2c5a20
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision da7e8c1b71db9273f83e9d0ba7d20e74e758a8ad)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision a57994f752662abc0aaa8c2cf5c3af47ec2c5a20)
@@ -124,7 +124,7 @@
 *************************************************************************/
 void initPreTreatmentMode( void )
 {
-    currentPreTreatmentState = HD_PRE_TREATMENT_START_STATE;
+    currentPreTreatmentState = HD_PRE_TREATMENT_WATER_SAMPLE_STATE;
     currentReservoirMgmtState = PRE_TREATMENT_RESERVOIR_MGMT_START_STATE;
     setUFVolStatus = FALSE;
     patientConnectionConfirm = FALSE;
@@ -196,6 +196,9 @@
 
     doorClosedRequired( FALSE, FALSE );
 
+    // Start pre-treatment mode in sample water state
+    transitionToSampleWater();
+
     return currentPreTreatmentState;
 }
 
@@ -218,16 +221,6 @@
     // execute mode state machine
     switch ( currentPreTreatmentState )
     {
-        case HD_PRE_TREATMENT_START_STATE:
-#ifndef _RELEASE_
-            if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_SAMPLE_WATER ) != SW_CONFIG_ENABLE_VALUE )
-#endif
-            {
-                transitionToSampleWater();
-            }
-            currentPreTreatmentState = HD_PRE_TREATMENT_WATER_SAMPLE_STATE;
-            break;
-
         case HD_PRE_TREATMENT_WATER_SAMPLE_STATE:
             currentPreTreatmentState = handleWaterSampleState();
             break;
@@ -652,27 +645,25 @@
 
     if ( SAMPLE_WATER_COMPLETE_STATE == getSampleWaterState() )
     {
-        {
-            cmdDGSampleWater( SAMPLE_WATER_CMD_END );
+        cmdDGSampleWater( SAMPLE_WATER_CMD_END );
 
-            if ( SELF_TEST_STATUS_PASSED == getSampleWaterResult() )
+        if ( SELF_TEST_STATUS_PASSED == getSampleWaterResult() )
+        {
+            if ( ( DG_MODE_STAN == dgOpMode ) && ( DG_STANDBY_MODE_STATE_IDLE == dgSubMode ) )
             {
-                if ( ( DG_MODE_STAN == dgOpMode ) && ( DG_STANDBY_MODE_STATE_IDLE == dgSubMode ) )
-                {
-                    state = HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE;
-                    cmdStartDG();
-                    transitionToConsumableSelfTest();
-                }
-                else
-                {
-                    cmdStopDG();
-                }
+                state = HD_PRE_TREATMENT_SELF_TEST_CONSUMABLE_STATE;
+                cmdStartDG();
+                transitionToConsumableSelfTest();
             }
             else
             {
-                requestNewOperationMode( MODE_STAN );
+                cmdStopDG();
             }
         }
+        else
+        {
+            requestNewOperationMode( MODE_STAN );
+        }
     }
 
     return state;