Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r6419179374edcd65da462de84e8aeaefb7e20320 -r126ad9f684cd96bc38d5e1ab5d79f5238681e3e5
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 6419179374edcd65da462de84e8aeaefb7e20320)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 126ad9f684cd96bc38d5e1ab5d79f5238681e3e5)
@@ -1232,13 +1232,22 @@
 
     if (  DFM_SENSOR_PARAM_CORRUPT_STATUS != getFPGADialysateFlowMeterStatus() )
     {
-        dialInFlowCalGain   = cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].gain;
-        dialInFlowCalOffset = cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].offset;
-        result = SELF_TEST_STATUS_PASSED;
+#ifndef DISABLE_CAL_CHECK
+        if ( cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].calibrationTime == 0 )
+        {
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_DIALYSATE_FLOW_INVALID_CALIBRATION, cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].calibrationTime,
+                                       cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].crc );
+        }
+        else
+#endif
+        {
+            dialInFlowCalGain   = cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].gain;
+            dialInFlowCalOffset = cal.hdFlowSensors[ CAL_DATA_HD_DIALYZER_FLOW_SENSOR ].offset;
+            result = SELF_TEST_STATUS_PASSED;
+        }
     }
     else
     {
-        result = SELF_TEST_STATUS_FAILED;
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_DIALYSATE_FLOW_STATUS_SELF_TEST_FAILURE, (U32)dfmStatus );
     }
 
@@ -1249,6 +1258,7 @@
 /*************************************************************************
  *                       TEST SUPPORT FUNCTIONS
  *************************************************************************/
+
 
 /*********************************************************************//**
  * @brief