Index: firmware/App/Modes/ModeROPermeateSample.c
===================================================================
diff -u -r7d4711edd7b40cd3e29f43e766f79a8a09586fe9 -rfafeb76a9e02672f4a03bc8c35a2b09950ff736f
--- firmware/App/Modes/ModeROPermeateSample.c	(.../ModeROPermeateSample.c)	(revision 7d4711edd7b40cd3e29f43e766f79a8a09586fe9)
+++ firmware/App/Modes/ModeROPermeateSample.c	(.../ModeROPermeateSample.c)	(revision fafeb76a9e02672f4a03bc8c35a2b09950ff736f)
@@ -686,11 +686,15 @@
             case DG_RO_PERM_SAMPLE_STATE_FLUSH_R2_TO_R1_AND_DRAIN_R1:
                 if ( ( TRUE == isDialysateCapOpen ) || ( TRUE == isConcentrateCapOpen ) )
                 {
-                    roPermeateSamplePrevState   = roPermeateSampleState;
-                    roPermeateSampleState       = DG_RO_PERM_SAMPLE_STATE_CANCEL_WATER_PATH;
-                    alarmDetectedPendingTrigger = ( TRUE == isDialysateCapOpen ? ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION :
-                                                                                 ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION );
-                    setROPermeateSampleStateTransition( roPermeateSampleState );
+                    if ( ( roPermeateSampleState != DG_RO_PERM_SAMPLE_STATE_CANCEL_WATER_PATH ) &&
+                         ( roPermeateSampleState != DG_RO_PERM_SAMPLE_STATE_CANCEL_BASIC_PATH ) )
+                    {
+                        roPermeateSamplePrevState   = roPermeateSampleState;
+                        roPermeateSampleState       = DG_RO_PERM_SAMPLE_STATE_CANCEL_WATER_PATH;
+                        alarmDetectedPendingTrigger = ( TRUE == isDialysateCapOpen ? ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION :
+                                                                                     ALARM_ID_DG_CONCENTRATE_CAP_NOT_IN_PROPER_POSITION );
+                        setROPermeateSampleStateTransition( roPermeateSampleState );
+                    }
                 }
                 break;
         }