Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -re8f30ca933a7c373c1a4a749ad84adb2f63b7722 -r16b178ff7528cb09c66413d19980a4eb0d13b48e
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision e8f30ca933a7c373c1a4a749ad84adb2f63b7722)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 16b178ff7528cb09c66413d19980a4eb0d13b48e)
@@ -189,7 +189,17 @@
  *************************************************************************/
 void signalUserConfirmDisposableRemoval( void )
 {
-    disposableRemovalConfirmed = TRUE;
+    BOOL accepted = FALSE;
+    REQUEST_REJECT_REASON_CODE_T rejReason = REQUEST_REJECT_REASON_DRAIN_NOT_COMPLETE;
+
+    if ( DRAIN_COMPLETE_STATE == currentDrainReservoirState )
+    {
+        disposableRemovalConfirmed = TRUE;
+        accepted = TRUE;
+        rejReason = REQUEST_REJECT_REASON_NONE;
+    }
+
+    sendDisposableRemovalConfirmResponse( accepted, rejReason );
 }
 
 /*********************************************************************//**