Index: firmware/App/Modes/ModeRecirculate.c
===================================================================
diff -u -rc0700a4503f28288f16070634bb87f4eccb2568c -r8a4182663ef6b12e3fd6414c0c14158943cd4ce1
--- firmware/App/Modes/ModeRecirculate.c	(.../ModeRecirculate.c)	(revision c0700a4503f28288f16070634bb87f4eccb2568c)
+++ firmware/App/Modes/ModeRecirculate.c	(.../ModeRecirculate.c)	(revision 8a4182663ef6b12e3fd6414c0c14158943cd4ce1)
@@ -82,12 +82,12 @@
     // re-initialize each time we transition to re-circulate mode
     initRecirculateMode();
 
+    stopPrimaryHeater();
+
     // set initial actuator states
     setValveState( VSP, VALVE_STATE_CLOSED );
     setValveState( VPI, VALVE_STATE_OPEN );
-#ifndef V_2_SYSTEM
     setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
-#endif
     setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );