Index: firmware/App/Modes/PreTreatmentRecirc.c
===================================================================
diff -u -r68f18c1952d37f75f27b7ca45969af2202729bb5 -r84bb8663dae71170e1743a2bed37b0aa47465b47
--- firmware/App/Modes/PreTreatmentRecirc.c	(.../PreTreatmentRecirc.c)	(revision 68f18c1952d37f75f27b7ca45969af2202729bb5)
+++ firmware/App/Modes/PreTreatmentRecirc.c	(.../PreTreatmentRecirc.c)	(revision 84bb8663dae71170e1743a2bed37b0aa47465b47)
@@ -15,6 +15,7 @@
 *
 ***************************************************************************/
 
+#include "AirTrap.h"
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
 #include "BloodFlow.h"
@@ -94,8 +95,7 @@
             break;
 
         default:
-            currentPreTreatmentRecircState = PRE_TREATMENT_RECIRC_STATE;
-            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_PRE_TREATMENT_RECIRC_STATE, (U32)currentPreTreatmentRecircState );
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_PRE_TREATMENT_RECIRC_STATE, currentPreTreatmentRecircState );
             break;
     }
 
@@ -159,6 +159,7 @@
     setValveAirTrap( STATE_CLOSED );
     cmdSetDGActiveReservoir( DG_RESERVOIR_1 );
     cmdStartDGTrimmerHeater();
+    startAirTrapControl();
 
     setBloodPumpTargetFlowRate( BLOOD_PUMP_RECIRC_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
     setDialInPumpTargetFlowRate( DIALYSATE_PUMP_RECIRC_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
@@ -183,6 +184,7 @@
         signalDialInPumpHardStop();
         signalBloodPumpHardStop();
         cmdStopDGTrimmerHeater();
+        endAirTrapControl();
 
         state = PRE_TREATMENT_RECIRC_STOPPED_STATE;
     }