Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -raa7b1f5f68aae23c1c52b32658fcb625c29accfb -r19e1a496b98f0205b20cd443f8f4d363e7af7f1a
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision aa7b1f5f68aae23c1c52b32658fcb625c29accfb)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 19e1a496b98f0205b20cd443f8f4d363e7af7f1a)
@@ -182,6 +182,9 @@
     signalDialOutPumpHardStop();
     stopSyringePump();
 
+    resetSignalFlags();
+    resetAlarmSignalFlags();
+
     // Set valves to default positions
     setValveAirTrap( STATE_CLOSED );
     setValvePosition( VDI, VALVE_POSITION_A_INSERT_EJECT );
Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r5256375bef09c0a71127849c0f68eb8c46b81b89 -r19e1a496b98f0205b20cd443f8f4d363e7af7f1a
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 5256375bef09c0a71127849c0f68eb8c46b81b89)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 19e1a496b98f0205b20cd443f8f4d363e7af7f1a)
@@ -131,8 +131,6 @@
 
 // ********** private function prototypes **********
 
-static void resetSignalFlags( void );
-static void resetAlarmSignalFlags( void );
 static void broadcastTreatmentSettingsRanges( void );
 static void broadcastTreatmentPeriodicData();
 static U32 getTreatmentTimeInMinutes( void );
@@ -172,9 +170,6 @@
     presMaxUFVolumeML = 0.0;
     presUFRate = 0.0;
 
-    resetSignalFlags();
-    resetAlarmSignalFlags();
-
     pendingParamChangesTimer = 0;
     pendingUFVolumeChange = 0.0;
     pendingUFRateChange = 0.0;
@@ -201,36 +196,6 @@
 
 /*********************************************************************//**
  * @brief
- * The resetSignalFlags function resets all non-alarm signal flags.
- * @details Inputs: none
- * @details Outputs: non-alarm signal flags set to FALSE
- * @return none
- *************************************************************************/
-static void resetSignalFlags( void )
-{
-    rinsebackToStoppedRequest = FALSE;
-    endTreatmentRequest = FALSE;
-    rinsebackToRecircRequest = FALSE;
-    bloodPrimeToDialysisRequest = FALSE;
-    treatmentEndToRinsebackRequest = FALSE;
-}
-
-/*********************************************************************//**
- * @brief
- * The resetAlarmSignalFlags function resets all alarm signal flags.
- * @details Inputs: none
- * @details Outputs: alarm signal flags set to FALSE
- * @return none
- *************************************************************************/
-static void resetAlarmSignalFlags( void )
-{
-    resumeTreatmentAlarmResponseRequest = FALSE;
-    initiateRinsebackAlarmResponseRequest = FALSE;
-    endTreatmentAlarmResponseRequest = FALSE;
-}
-
-/*********************************************************************//**
- * @brief
  * The transitionToTreatmentMode function prepares for transition to treatment mode.
  * @details Inputs: none
  * @details Outputs:
@@ -1574,7 +1539,37 @@
     return treatmentTime;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The resetSignalFlags function resets all non-alarm signal flags.
+ * @details Inputs: none
+ * @details Outputs: non-alarm signal flags set to FALSE
+ * @return none
+ *************************************************************************/
+void resetSignalFlags( void )
+{
+    rinsebackToStoppedRequest = FALSE;
+    endTreatmentRequest = FALSE;
+    rinsebackToRecircRequest = FALSE;
+    bloodPrimeToDialysisRequest = FALSE;
+    treatmentEndToRinsebackRequest = FALSE;
+}
 
+/*********************************************************************//**
+ * @brief
+ * The resetAlarmSignalFlags function resets all alarm signal flags.
+ * @details Inputs: none
+ * @details Outputs: alarm signal flags set to FALSE
+ * @return none
+ *************************************************************************/
+void resetAlarmSignalFlags( void )
+{
+    resumeTreatmentAlarmResponseRequest = FALSE;
+    initiateRinsebackAlarmResponseRequest = FALSE;
+    endTreatmentAlarmResponseRequest = FALSE;
+}
+
+
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
Index: firmware/App/Modes/ModeTreatment.h
===================================================================
diff -u -r19a8bf98a7154e24c35da25225d4b55bf70ddd09 -r19e1a496b98f0205b20cd443f8f4d363e7af7f1a
--- firmware/App/Modes/ModeTreatment.h	(.../ModeTreatment.h)	(revision 19a8bf98a7154e24c35da25225d4b55bf70ddd09)
+++ firmware/App/Modes/ModeTreatment.h	(.../ModeTreatment.h)	(revision 19e1a496b98f0205b20cd443f8f4d363e7af7f1a)
@@ -137,6 +137,9 @@
 BOOL verifyBloodAndDialysateRateSettingsChange( U32 bloodRate, U32 dialRate );
 BOOL verifyPressureLimitsChange( PRESSURE_LIMIT_CHANGE_REQUEST_T *data );
 
+void resetSignalFlags( void );
+void resetAlarmSignalFlags( void );
+
 BOOL testSetTreatmentTimeRemainingOverride( U32 value );
 BOOL testSetTreatmentTimePublishIntervalOverride( U32 ms );
 BOOL testResetTreatmentTimePublishIntervalOverride( void );