diff --git a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
index a052625b6..006d4a93b 100644
--- a/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
+++ b/TestBenchFramework/BenchControl/TestMethods/FlyingStartMassCollection/FlyingStartMassCollectionSeq.cs
@@ -499,10 +499,6 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 			while (!e.Contains(Event.MeasurementStarted));
 
 
-			foreach (var rr in sensPath.RegisterReaders)
-			{
-			}
-
             foreach (var rr in sensPath.RegisterReaders)
             {
                 if (rr is WaterMeters.iPerl.WaterMeter) (rr as WaterMeters.iPerl.WaterMeter).TestName = test.Name;
@@ -589,7 +585,12 @@ namespace TBF.BenchControl.TestMethods.FlyingStartMassCollection
 
         test_completed:
 
-			if (transitionAfter == null)
+			///
+			/// Water is stopped immediately after the test and before the 2nd mass measurement in case;
+			///  - no 'transition sequence after test' is used
+			///  - this is the last (or the only) test repetition or test is a part of an 'outer loop'
+			///
+			if (transitionAfter == null && (outerLoopMode || repetitionNr == test.Repeats))
 			{
 				switch (Transition(transitionAfter, TransitionContext.AfterTest))
 				{