Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r2b79e2d880e3ed9867321835388011726d0a2e52 -rdd6ff808dfa6271e84f09940bcfade6aa18fb121
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 2b79e2d880e3ed9867321835388011726d0a2e52)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision dd6ff808dfa6271e84f09940bcfade6aa18fb121)
@@ -300,6 +300,7 @@
 
     //Set substate for event
     setCurrentSubState( (U32)currentDialysisState );
+    setCurrent4thLevelState( (U32)currentUFState );
 }
 
 /*********************************************************************//**
@@ -795,7 +796,7 @@
 
     if ( priorSubState != currentUFState )
     {
-        setCurrent4thLevelState( currentUFState );
+        setCurrent4thLevelState( (U32)currentUFState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentUFState );
     }
 
@@ -842,7 +843,7 @@
 
     if ( priorSubState != currentSalineBolusState )
     {
-        setCurrent4thLevelState( currentSalineBolusState );
+        setCurrent4thLevelState( (U32)currentSalineBolusState );
         SEND_EVENT_WITH_2_U32_DATA( HD_EVENT_SUB_STATE_CHANGE, priorSubState, currentSalineBolusState );
     }
 
@@ -921,6 +922,7 @@
         if ( SALINE_BOLUS_STATE_IDLE == currentSalineBolusState )
         {
             *dialysisState = DIALYSIS_SALINE_BOLUS_STATE;
+            setCurrent4thLevelState( (U32)currentSalineBolusState );
         }
         else
         {
@@ -972,6 +974,7 @@
             result = UF_PAUSED_STATE;
             // Go to saline bolus state
             *dialysisState = DIALYSIS_SALINE_BOLUS_STATE;
+            setCurrent4thLevelState( (U32)currentSalineBolusState );
         }
         else
         {