Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r0953a2a6940f9f096fa98cc1e8a5578deab4d8ef -rc67b30d79e2ca2bdd8ebda901740cad0e0f6126f
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 0953a2a6940f9f096fa98cc1e8a5578deab4d8ef)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision c67b30d79e2ca2bdd8ebda901740cad0e0f6126f)
@@ -16,11 +16,6 @@
 
 #include "etpwm.h"
 
-#ifdef ENABLE_DIP_SWITCHES
-#include "mibspi.h"
-#include "FPGA.h"
-#endif
-
 #include "AlarmMgmt.h"
 #include "Common.h"
 #include "Heaters.h"
@@ -31,6 +26,11 @@
 #include "TaskGeneral.h"
 #include "Timers.h"
 
+#ifdef ENABLE_DIP_SWITCHES
+#include "mibspi.h"
+#include "FPGA.h"
+#endif
+
 /**
  *  @addtogroup Heaters
  *  @{
@@ -314,10 +314,12 @@
     // If the RO pump is not on, turn off the heaters
     if ( ! isReverseOsmosisPumpOn() )
     {
+#ifndef ENABLE_DIP_SWITCHES
 #ifndef EMC_TEST_BUILD
         stopPrimaryHeater();  // TODO - this is so immediate - if other module requests RO pump on and start heater, this monitor may stop the heater request before RO pump has a chance to start
         stopTrimmerHeater();
 #endif
+#endif
     }
 }
 
@@ -556,6 +558,7 @@
         F32 fanPWM = 0.25;
         etpwmSetCmpA( etpwmREG6, (U32)( (S32)( ( fanPWM * (F32)(etpwmREG6->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) );
         etpwmSetCmpB( etpwmREG6, (U32)( (S32)( ( fanPWM * (F32)(etpwmREG6->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) );
+        hasStartPrimaryHeaterRequested = TRUE;
     }
 #endif
 #endif