Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r9fbffd60aca52d01c6f8761ac4f73cd2b7d524fd -r778c16d5c83e4af29aa9c0e8eb46386c16f60778
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 9fbffd60aca52d01c6f8761ac4f73cd2b7d524fd)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 778c16d5c83e4af29aa9c0e8eb46386c16f60778)
@@ -339,10 +339,11 @@
     {
         if ( ( TRUE == areInletWaterConditionsAlarmsActive() ) || ( TRUE == areConductivityAlarmsActive() ) )
         {
+            setModeFillStateTransition( DG_FILL_MODE_STATE_PAUSED );
             fillState = DG_FILL_MODE_STATE_PAUSED;
-            setModeFillStateTransition( fillState );
         }
     }
+
     // Execute current Fill state
     switch ( fillState )
     {
@@ -383,7 +384,6 @@
             fillState = DG_FILL_MODE_STATE_TEST_INLET_WATER;
             break;
     }
-
     publishFillModeData();
 
     return fillState;
@@ -438,6 +438,7 @@
 F32 getIntegratedVolumeML( void )
 {
     F32 integratedVolume = getF32OverrideValue( &integratedVolumeML );
+
     return integratedVolume;
 }
 
@@ -990,7 +991,8 @@
     if ( ( FALSE == areInletWaterConditionsAlarmsActive() ) && ( FALSE == areConductivityAlarmsActive() ) )
     {
         didFillRecoverFromPause   = TRUE;
-        result                    = DG_FILL_MODE_STATE_TEST_INLET_WATER;        // setModeFillStateTransition() not required, no setup needed
+        result                    = DG_FILL_MODE_STATE_TEST_INLET_WATER;
+        setModeFillStateTransition( result );
     }
 
     return result;
@@ -1020,6 +1022,7 @@
             dialysatePauseElapsedTimeMS += calcTimeSince(dialysatePauseStartTimeMS);
         }
     }
+
     // Execute on running state
     switch( state )
     {