Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -ra3b2561e56bf8491530412fad06ef8ab9de642e2 -r85e7d6f43d0d6f8fbf77a0894373c5003cf93c6e
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision a3b2561e56bf8491530412fad06ef8ab9de642e2)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 85e7d6f43d0d6f8fbf77a0894373c5003cf93c6e)
@@ -155,15 +155,9 @@
     }
 
     // Initialize the persistent alarms
-    initPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS,
-                                                                               HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS );
-
-    initPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS,
-                                                                                HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS );
-
-    initPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS,
-                                                                          HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS );
-
+    initPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS );
+    initPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS, HEATERS_VOLTAGE_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_RO_FLOW_TOO_LOW_WHILE_PRIMARY_HEATER_IS_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_DIALYSATE_FLOW_TOO_LOW_WHILE_TRIMMER_HEATER_IS_ON, HEATERS_ON_NO_FLOW_TIMEOUT_MS, HEATERS_ON_NO_FLOW_TIMEOUT_MS );
 }
@@ -885,9 +879,12 @@
     BOOL isSmallPriOut = ( fabs( smallPriExpectedVoltage - smallPriVoltage ) > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE );
     BOOL isTrimmerOut  = ( fabs( trimmerExpectedVoltage  - trimmerVoltage )  > HEATERS_VOLTAGE_TOLERANCE_V ? TRUE : FALSE );
 
-    checkPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE,  isMainPriOut,  mainPriDC,  HEATERS_VOLTAGE_TOLERANCE_V );
-    checkPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isSmallPriOut, smallPriDC, HEATERS_VOLTAGE_TOLERANCE_V );
-    checkPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE,       isTrimmerOut,  trimmerDC,  HEATERS_VOLTAGE_TOLERANCE_V );
+    if ( getCurrentOperationMode() != DG_MODE_INIT )
+    {
+        checkPersistentAlarm( ALARM_ID_DG_MAIN_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE,  isMainPriOut,  mainPriDC,  HEATERS_VOLTAGE_TOLERANCE_V );
+        checkPersistentAlarm( ALARM_ID_DG_SMALL_PRIMARY_HEATER_VOLTAGE_OUT_OF_RANGE, isSmallPriOut, smallPriDC, HEATERS_VOLTAGE_TOLERANCE_V );
+        checkPersistentAlarm( ALARM_ID_DG_TRIMMER_HEATER_VOLTAGE_OUT_OF_RANGE,       isTrimmerOut,  trimmerDC,  HEATERS_VOLTAGE_TOLERANCE_V );
+    }
 }