Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -re97941eef8021daeac9e8b9afa631cc37c117c2f -r0545b9e7d1f70400f21ad4812e86011d3d101240
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision e97941eef8021daeac9e8b9afa631cc37c117c2f)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 0545b9e7d1f70400f21ad4812e86011d3d101240)
@@ -1283,7 +1283,6 @@
     // Retrieve blood flow sensor calibration data and check for sensor connected status
 #ifndef SKIP_CALIBRATION_TESTS
     if ( ( TRUE == getCalibrationData( &cal ) ) && ( BFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGABloodFlowMeterStatus() ) )
-#endif
     {
         bloodFlowCalGain = cal.bloodFlowGain;
         bloodFlowCalOffset = cal.bloodFlowOffset_mL_min;
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r7e9a0ee7e8f64336235f11a84726871777747f8c -r0545b9e7d1f70400f21ad4812e86011d3d101240
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 7e9a0ee7e8f64336235f11a84726871777747f8c)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 0545b9e7d1f70400f21ad4812e86011d3d101240)
@@ -1231,7 +1231,6 @@
 #ifndef SKIP_CALIBRATION_TESTS
     // Retrieve dialysate flow sensor calibration data
     if ( ( TRUE == getCalibrationData( &cal ) ) && ( DFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGADialysateFlowMeterStatus() ) )
-#endif
     {
         dialInFlowCalGain = cal.dialysateFlowGain;
         dialInFlowCalOffset = cal.dialysateFlowOffset_mL_min;