Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r39e2d7a0d208e1e79e4add6aad51035fac777c3e -rd6a491cb0614634342be3ea058d51a68ef0c788c
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 39e2d7a0d208e1e79e4add6aad51035fac777c3e)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision d6a491cb0614634342be3ea058d51a68ef0c788c)
@@ -1051,6 +1051,8 @@
 
     if ( ( TRUE == doorOpened ) && ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) ) )
     {
+        doorClosedRequired( TRUE, TRUE );
+        doorOpened = FALSE;
         nextState = PRE_TREATMENT_PAT_CONN_WAIT_FOR_USER_CONFIRM_STATE;
     }
 
@@ -1075,11 +1077,7 @@
 
     if ( TRUE == patientConnectionConfirm )
     {
-        doorClosedRequired( TRUE, TRUE );
-        if ( STATE_CLOSED == getSwitchStatus( FRONT_DOOR ) )
-        {
-            nextState = PRE_TREATMENT_PAT_CONN_WAIT_FOR_TREATMENT_START_STATE;
-        }
+        nextState = PRE_TREATMENT_PAT_CONN_WAIT_FOR_TREATMENT_START_STATE;
     }
 
     return nextState;