Index: firmware/App/Modes/FPModes/FPOperationModes.c
===================================================================
diff -u -r4360891b921388dcc35e7b0362c3e4e246714e36 -r6c1e038c32aae95cd5649320d12c1d7239834425
--- firmware/App/Modes/FPModes/FPOperationModes.c	(.../FPOperationModes.c)	(revision 4360891b921388dcc35e7b0362c3e4e246714e36)
+++ firmware/App/Modes/FPModes/FPOperationModes.c	(.../FPOperationModes.c)	(revision 6c1e038c32aae95cd5649320d12c1d7239834425)
@@ -8,7 +8,7 @@
 * @file    FPOperationModes.c
 *
 * @author  (last)      Raghu Kallala
-* @date    (last)      06-Apr-2026
+* @date    (last)      10-Apr-2026
 *
 * @author  (original)  Michael Garthwaite
 * @date    (original)  08-Sep-2025
@@ -430,6 +430,11 @@
     {
         isDeviceDefeatured = TRUE;
     }
+    // TODO remove the else if after NVM implementation. Value is read from NV memory no need to reset
+    else if ( TRUE != getTestConfigStatus( TEST_CONFIG_FP_ENABLE_DEFEATURE ) )
+    {
+        isDeviceDefeatured = FALSE;
+    }
 
     // TODO - pull status from NV mem.
     return isDeviceDefeatured;
@@ -450,6 +455,11 @@
     {
         isBoostInstalled = TRUE;
     }
+    // TODO remove the else if after NVM implementation. Value is read from NV memory no need to reset
+    else if ( TRUE != getTestConfigStatus( TEST_CONFIG_FP_ENABLE_BOOST_PUMP ) )
+    {
+        isBoostInstalled = FALSE;
+    }
 
     // TODO - pull status from NV mem.
     return isBoostInstalled;