Index: firmware/App/Modes/StateTxDialysis.c
===================================================================
diff -u -r1abc0349c736a70fb56db6895947abfbba0eee22 -r6b9b882169f108f9a5072dc60cdabbc1687aafcc
--- firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision 1abc0349c736a70fb56db6895947abfbba0eee22)
+++ firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision 6b9b882169f108f9a5072dc60cdabbc1687aafcc)
@@ -53,7 +53,6 @@
 static BOOL ufResumeRequested;                                  ///< Flag indicates UF resume has been requested by user.
 static BOOL autoResumeUF;                                       ///< Flag indicates UF should be auto-resumed after saline bolus completes.
 static BOOL fluidBolusRequested;                                ///< Flag indicating fluid bolus has been requested by user.
-static BOOL bolusStarted;                                       ///< Flag indicating fluid bolus start signal has been sent.
 
 // ********** private function prototypes **********
 
@@ -93,7 +92,6 @@
     ufResumeRequested        = FALSE;
     autoResumeUF             = FALSE;
     fluidBolusRequested      = FALSE;
-    bolusStarted             = FALSE;
 }
 
 /*********************************************************************//**
@@ -173,6 +171,8 @@
             dialysisResumeState = currentDialysisState;
             cmdBypassDialyzer( TRUE );
             cmdChangeQuf( 0.0F );
+            // Start bolus and transition to bolus state
+            signalStartFluidBolus( setBloodFlowRate );
             break;
 
         default:
@@ -463,25 +463,19 @@
  * The handleDialysisFluidBolusState function handles the fluid bolus
  * sub-state of the Dialysis state machine. Signals the fluid bolus
  * service to start.
- * @details \b Inputs: dialysisResumeState, bolusStarted
- * @details \b Outputs: bolusStarted
+ * @details \b Inputs: dialysisResumeState
+ * @details \b Outputs: none
  * @return next dialysis state.
  *************************************************************************/
 static DIALYSIS_STATE_T handleDialysisFluidBolusState( void )
 {
     DIALYSIS_STATE_T result = DIALYSIS_UF_FLUID_BOLUS_STATE;
 
-    // Start fluid bolus if not started
-    if ( FALSE == bolusStarted )
-    {
-        bolusStarted = signalStartFluidBolus( setBloodFlowRate );
-    }
     // Restore actuators and return to pre-bolus sub-state upon bolus complete or abort
-    else if ( FALSE == isFluidBolusActive() )
+    if ( FALSE == isFluidBolusActive() )
     {
         cmdBypassDialyzer( FALSE );
         transitionToDialysisState( dialysisResumeState );
-        bolusStarted = FALSE;
         result = dialysisResumeState;
     }