Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r0798ef0a54e4ddaa551ced7b2bd9b032aa458095 -r5545719a6bde1e93991c25918d975024b44c1b43
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 0798ef0a54e4ddaa551ced7b2bd9b032aa458095)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 5545719a6bde1e93991c25918d975024b44c1b43)
@@ -454,10 +454,12 @@
     U08 flowErrorCtr = getFPGABloodFlowErrorCounter();
     U08 flowStatus = getFPGABloodFlowMeterStatus();
 
+#ifndef DISABLE_PUMP_FLOW_CHECKS
     if ( flowStatus != DFM_SENSOR_CONNECTED_STATUS )
     {
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_BLOOD_FLOW_STATUS_SELF_TEST_FAILURE, (U32)flowStatus );
     }
+#endif
 
 #ifndef DISABLE_FPGA_COUNTER_CHECKS
     // Check for stale flow reading
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r0798ef0a54e4ddaa551ced7b2bd9b032aa458095 -r5545719a6bde1e93991c25918d975024b44c1b43
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 0798ef0a54e4ddaa551ced7b2bd9b032aa458095)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 5545719a6bde1e93991c25918d975024b44c1b43)
@@ -420,10 +420,12 @@
     U08 flowErrorCtr = getFPGADialysateFlowErrorCounter();
     U08 flowStatus = getFPGADialysateFlowMeterStatus();
 
+#ifndef DISABLE_PUMP_FLOW_CHECKS
     if ( flowStatus != DFM_SENSOR_CONNECTED_STATUS )
     {
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DIALYSATE_FLOW_STATUS_SELF_TEST_FAILURE, (U32)flowStatus );
     }
+#endif
 
 #ifndef DISABLE_FPGA_COUNTER_CHECKS
     // Check for stale flow reading