Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r24b2fe72608344e67ef37234085d15ad5e4fcc37 -r40f46e196349e3dd730048a354df8bbb2e40407d
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 24b2fe72608344e67ef37234085d15ad5e4fcc37)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 40f46e196349e3dd730048a354df8bbb2e40407d)
@@ -367,7 +367,10 @@
     if ( STATE_CLOSED == getFPGADoorState() )
     {
 #ifdef SKIP_UI_INTERACTION
-        patientDisconnectionConfirmed = TRUE;
+        if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+        {
+            patientDisconnectionConfirmed = TRUE;
+        }
 #endif
         if ( TRUE == patientDisconnectionConfirmed )
         {
@@ -410,7 +413,10 @@
     HD_POST_TREATMENT_STATE_T state = HD_POST_TREATMENT_DISPOSABLE_REMOVAL_STATE;
 
 #ifdef SKIP_UI_INTERACTION
-    disposableRemovalConfirmed = TRUE;
+    if ( getSoftwareConfigStatus( SW_CONFIG_DISABLE_UI_INTERACTION ) != SW_CONFIG_ENABLE_VALUE )
+    {
+        disposableRemovalConfirmed = TRUE;
+    }
 #endif
 
     if ( TRUE == disposableRemovalConfirmed )