Index: firmware/App/Modes/FPModeFault.c
===================================================================
diff -u -rf79d3737907fd08293d56f60f9f439ac68c81855 -r6dd382e3988fac2f9ee041b4738d67305e17a6a2
--- firmware/App/Modes/FPModeFault.c	(.../FPModeFault.c)	(revision f79d3737907fd08293d56f60f9f439ac68c81855)
+++ firmware/App/Modes/FPModeFault.c	(.../FPModeFault.c)	(revision 6dd382e3988fac2f9ee041b4738d67305e17a6a2)
@@ -271,9 +271,15 @@
 {
     U32 i;
 
-    if ( TRUE == isFPDefeatured() )
+    if ( FALSE == isFPDefeatured() )
     {
 
+        if ( TRUE == isBoostPumpInstalled() )
+        {
+            signalBoostPumpHardStop();
+        }
+        signalROPumpHardStop();
+
         if ( TRUE == isDrainEnabled )
         {
             setValveState( M4_VALV, VALVE_STATE_CLOSED );
@@ -287,20 +293,12 @@
             setValveState( P20_VALV, VALVE_STATE_CLOSED );
             setValveState( P43_VALV, VALVE_STATE_CLOSED );
         }
-
         else
         {
             for ( i = FIRST_VALVE; i <= NUM_OF_VALVES; i++ )
             {
                 setValveState( (VALVES_T)i, VALVE_STATE_CLOSED);
             }
-
-            if (TRUE == isBoostPumpInstalled())
-            {
-                signalBoostPumpHardStop();
-            }
-
-            signalROPumpHardStop();
         }
     }
     // Defeatured System. Only have m4 to control