Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rfacca88de0d4c72d943b59bad9264a9b0a031ae5 -r949b386b5f58ab8bc534bd7e913ecb9f2c084c17
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision facca88de0d4c72d943b59bad9264a9b0a031ae5)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 949b386b5f58ab8bc534bd7e913ecb9f2c084c17)
@@ -135,9 +135,6 @@
     resetBloodPumpRotorCount();
     resetDialInPumpRotorCount();
 
-    doorClosedRequired( FALSE, FALSE );
-    syringeDetectionRequired( FALSE );
-
     // Set user alarm recovery actions allowed in this mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, FALSE );
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, FALSE );
@@ -159,8 +156,15 @@
     // If we just exited Post Treatment Mode, goto disinfect sub state.
     if ( MODE_POST == previousOpMode )
     {
+        doorClosedRequired( FALSE, FALSE );             // door no longer required to be closed in standby mode
         currentStandbyState = STANDBY_WAIT_FOR_DISINFECT_STATE;
     }
+    else
+    {
+        doorClosedRequired( TRUE, FALSE );
+    }
+    syringeDetectionRequired( FALSE );
+
     // Request DG service record and usage information from DG
     sendDGServiceRequestToDG();
     sendDGUsageInfoRequestToDG();
@@ -647,16 +651,12 @@
                 {
                     syringePumpVerifyForceSensorDACCalibration();
                     homingInitiated = FALSE;                        // reset for next time
+                    doorClosedRequired( FALSE, FALSE );             // door no longer required to be closed in standby mode
                     state = STANDBY_WAIT_FOR_TREATMENT_STATE;       // Go to wait for treatment state after above check
                 }
             }
         }
     }
-    else
-    {
-        // Trigger door open alarm to prompt user to close the door
-        activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
-    }
 
     return state;
 }