Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r1a219888b8fda9dcbbfc51fbe76490ee247f5f14 -r691927569039e47633ea79eff8c7947b84ecc2ab
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 1a219888b8fda9dcbbfc51fbe76490ee247f5f14)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 691927569039e47633ea79eff8c7947b84ecc2ab)
@@ -195,7 +195,7 @@
 
     acidMixRatio                  = acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidConcMixRatio;
     bicarbMixRatio                = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbConcMixRatio;
-    fillState                     = DG_FILL_MODE_STATE_START;
+    fillState                     = DG_FILL_MODE_STATE_TEST_INLET_WATER;
     dialysateFillStartTimeMS      = 0;
     dataPublishCounter            = DATA_PUBLISH_COUNTER_START_COUNT;
     reservoirBaseWeight           = 0.0F;
@@ -336,10 +336,6 @@
     // Execute current Fill state
     switch ( fillState )
     {
-        case DG_FILL_MODE_STATE_START:
-            fillState = DG_FILL_MODE_STATE_TEST_INLET_WATER;
-            break;
-
         case DG_FILL_MODE_STATE_TEST_INLET_WATER:
             fillState = handleTestInletWaterState();
             break;
@@ -374,7 +370,6 @@
 
         default:
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_FILL_MODE_INVALID_EXEC_STATE, fillState )
-            fillState = DG_FILL_MODE_STATE_START;
             break;
     }
 
@@ -983,7 +978,7 @@
     if ( ( FALSE == areInletWaterConditionsAlarmsActive() ) && ( FALSE == areConductivityAlarmsActive() ) )
     {
         havePauseActuatorsBeenSet = FALSE;
-        result                    = DG_FILL_MODE_STATE_START;
+        result                    = DG_FILL_MODE_STATE_TEST_INLET_WATER;
     }
 
     return result;
@@ -1005,7 +1000,6 @@
 {
     switch( state )
     {
-        case DG_FILL_MODE_STATE_START:
         case DG_FILL_MODE_STATE_TEST_INLET_WATER:
             // Do nothing
             break;