Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -r38355442b06187fe5d57deca647b3adf2fa26b89 -re5167d0700038c1faf8b689b844a905f20c0d3c6
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 38355442b06187fe5d57deca647b3adf2fa26b89)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision e5167d0700038c1faf8b689b844a905f20c0d3c6)
@@ -207,16 +207,20 @@
  *************************************************************************/
 U32 transitionToTreatmentMode( void )
 {
-    // Initialize treatment mode each time we transition to it
-    initTreatmentMode();
-    initReservoirs();
-    // Initialize treatment sub-modes each time we transition to treatment mode
-    initBloodPrime();
-    initDialysis();
-    initTreatmentStop();
-    initRinseback();
-    initTreatmentRecirc();
-    initTreatmentEnd();
+    if ( ( getTestConfigStatus( TEST_CONFIG_RECOVER_TREATMENT ) != TRUE ) || ( getPreviousOperationMode() != DG_MODE_FAUL ) )
+    {
+        // Initialize treatment mode each time we transition to it
+        initTreatmentMode();
+        initReservoirs();
+        // Initialize treatment sub-modes each time we transition to treatment mode
+        initBloodPrime();
+        initDialysis();
+        initTreatmentStop();
+        initRinseback();
+        initTreatmentRecirc();
+        initTreatmentEnd();
+    }
+
     setCurrentSubState( NO_SUB_STATE );
     // Enable venous bubble detection in treatment mode
     setVenousBubbleDetectionEnabled( TRUE );