Index: firmware/App/Modes/StateTxDialysis.c
===================================================================
diff -u -ra1f14a4e422f94b6bc25d1b91839761e7e1196d7 -r5ace05425139aa4c64318ecd3b90782e01ef2f7d
--- firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision a1f14a4e422f94b6bc25d1b91839761e7e1196d7)
+++ firmware/App/Modes/StateTxDialysis.c	(.../StateTxDialysis.c)	(revision 5ace05425139aa4c64318ecd3b90782e01ef2f7d)
@@ -121,6 +121,12 @@
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, TRUE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_END_TREATMENT, TRUE );
 
+    // If we got from alarm resume, reset the state if we are in bolus previously
+    if ( DIALYSIS_UF_FLUID_BOLUS_STATE == currentDialysisState )
+    {
+        currentDialysisState = dialysisResumeState;
+    }
+
     // Set actuators as appropriate for state
     cmdStartGenerateDialysate( setDialysateFlowRate, setUFRateMlMin, dialTemp, FALSE,
                                acidConvFactor, bicarbConvFactor, sodium, bicarbonate  );