Index: Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsDataSynchronizationService.cs
===================================================================
diff -u -rfa82eea9c005e9a95f257da305ed0ca293e8002e -red10b51e148f3b3b09ebaaf24e0a2021b841e7d5
--- Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsDataSynchronizationService.cs	(.../WaveConditionsDataSynchronizationService.cs)	(revision fa82eea9c005e9a95f257da305ed0ca293e8002e)
+++ Riskeer/Revetment/src/Riskeer.Revetment.Service/WaveConditionsDataSynchronizationService.cs	(.../WaveConditionsDataSynchronizationService.cs)	(revision ed10b51e148f3b3b09ebaaf24e0a2021b841e7d5)
@@ -122,6 +122,9 @@
         /// <typeparam name="TCalculation">The type of the calculation.</typeparam>
         /// <returns>An <see cref="IEnumerable{T}"/> of calculations which are affected by clearing the output.</returns>
         /// <exception cref="ArgumentNullException">Thrown when any parameter is <c>null</c>.</exception>
+        /// <remarks>The output is only cleared when <see cref="WaveConditionsInput.WaterLevelType"/> is
+        /// <see cref="WaveConditionsInputWaterLevelType.UserDefinedTargetProbability"/>. This <see cref="WaveConditionsInput.WaterLevelType"/>
+        /// is then also set to <see cref="WaveConditionsInputWaterLevelType.None"/>.</remarks>
         public static IEnumerable<IObservable> ClearWaveConditionsCalculationOutputAndRemoveTargetProbability<TFailureMechanism, TCalculation>(
             TFailureMechanism failureMechanism, HydraulicBoundaryLocationCalculationsForTargetProbability calculationsForTargetProbability)
             where TFailureMechanism : IFailureMechanism
@@ -144,6 +147,7 @@
                 calculation.InputParameters.CalculationsTargetProbability = null;
                 if (calculation.InputParameters.WaterLevelType == WaveConditionsInputWaterLevelType.UserDefinedTargetProbability)
                 {
+                    calculation.InputParameters.WaterLevelType = WaveConditionsInputWaterLevelType.None;
                     RiskeerCommonDataSynchronizationService.ClearCalculationOutput(calculation);
                 }
                 affectedItems.Add(calculation);
Index: Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsDataSynchronizationServiceTest.cs
===================================================================
diff -u -r2512e1d3bbadf2a96761bd456e5eeafbf8c79f2c -red10b51e148f3b3b09ebaaf24e0a2021b841e7d5
--- Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsDataSynchronizationServiceTest.cs	(.../WaveConditionsDataSynchronizationServiceTest.cs)	(revision 2512e1d3bbadf2a96761bd456e5eeafbf8c79f2c)
+++ Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsDataSynchronizationServiceTest.cs	(.../WaveConditionsDataSynchronizationServiceTest.cs)	(revision ed10b51e148f3b3b09ebaaf24e0a2021b841e7d5)
@@ -293,7 +293,8 @@
 
             // Assert
             CollectionAssert.AreEqual(expectedAffectedCalculations, affectedCalculations);
-            Assert.IsTrue(expectedAffectedCalculationsOutputCleared.All(c => !c.HasOutput));
+            Assert.IsTrue(expectedAffectedCalculationsOutputCleared.All(
+                              c => !c.HasOutput && c.InputParameters.WaterLevelType == WaveConditionsInputWaterLevelType.None));
             Assert.IsTrue(failureMechanism.Calculations.Except(expectedAffectedCalculationsOutputCleared).All(c => c.HasOutput));
             Assert.IsTrue(expectedAffectedCalculations.All(c => c.InputParameters.CalculationsTargetProbability == null));
             mocks.VerifyAll();