Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r992975fb3cd56ddd7567b5e27f8bebd9b9948e9d -re41df6b9a323e27c7d779f602579bbcf457ffa6d
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 992975fb3cd56ddd7567b5e27f8bebd9b9948e9d)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision e41df6b9a323e27c7d779f602579bbcf457ffa6d)
@@ -218,7 +218,7 @@
 {
     F32 targetFlowLPM = getTargetFillFlowRateLPM();
 
-    if ( getTestConfigStatus( TEST_CONFIG_RECOVER_TREATMENT ) != TRUE )
+    if ( ( getTestConfigStatus( TEST_CONFIG_RECOVER_TREATMENT ) != TRUE ) || ( getPreviousOperationMode() != DG_MODE_FAUL ) )
     {
         initFillMode();
         setCurrentSubState( NO_SUB_STATE );