Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r1e22b6ff6f42ddc57ad6c17e56057ab8a3765680 -rab14e70c7bac24b0c3ebd02c6763285cdd3951ce
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 1e22b6ff6f42ddc57ad6c17e56057ab8a3765680)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision ab14e70c7bac24b0c3ebd02c6763285cdd3951ce)
@@ -624,7 +624,7 @@
         }
 
 #ifndef _RELEASE_
-        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK ) != SW_CONFIG_ENABLE_VALUE )
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_DISINFECT_CONDUCTIVITY_CHECK ) )
         {
             hasConductivityPassed = TRUE;
         }
@@ -2067,16 +2067,19 @@
  *************************************************************************/
 static void monitorModeHeatDisinfect( void )
 {
-    if ( ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) && ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) )
+#ifndef _RELEASE_
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_CAPS_MONITOR ) != SW_CONFIG_ENABLE_VALUE )
+#endif
     {
-        // Set the variables to fail and go to cancel water path. Set the pending alarm to no alarm so the cancel water path
-        // will not be raising the alarm at end of the cancel water path. The recoverable alarm is raised here in this function
-        U32 cap                     = (U32)( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ? CONCENTRATE_CAP : DIALYSATE_CAP );
-        prevHeatDisinfectState      = heatDisinfectState;
-        heatDisinfectState          = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
-        alarmDetectedPendingTrigger = ALARM_ID_NO_ALARM;
-
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION, cap )
+        if ( ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ) && ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ) )
+        {
+            // Set the variables to fail and go to cancel water path. Set the pending alarm to no alarm so the cancel water path
+            // will not be raising the alarm at end of the cancel water path. The recoverable alarm is raised here in this function
+            U32 cap                     = (U32)( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) ? CONCENTRATE_CAP : DIALYSATE_CAP );
+            prevHeatDisinfectState      = heatDisinfectState;
+            heatDisinfectState          = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
+            alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION;
+        }
     }
 }