Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs
===================================================================
diff -u -rc5403002418d1b299cd40a15f93e151caa28ea14 -r54d81da9b5622275aef0c85397d3c7f23e08c67b
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs	(.../WaveConditionsInputContextProperties.cs)	(revision c5403002418d1b299cd40a15f93e151caa28ea14)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs	(.../WaveConditionsInputContextProperties.cs)	(revision 54d81da9b5622275aef0c85397d3c7f23e08c67b)
@@ -218,7 +218,7 @@
         {
             get
             {
-                return data.WrappedData.WaterLevels.ToArray();
+                return data.WrappedData.GetWaterLevels(getNormativeAssessmentLevelFunc()).ToArray();
             }
         }
 
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs
===================================================================
diff -u -r676f93dc0a8c9b118af25ffc8032ad693187fa97 -r54d81da9b5622275aef0c85397d3c7f23e08c67b
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision 676f93dc0a8c9b118af25ffc8032ad693187fa97)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs	(.../WaveConditionsInputContextPropertiesTest.cs)	(revision 54d81da9b5622275aef0c85397d3c7f23e08c67b)
@@ -189,7 +189,6 @@
             Assert.AreEqual(lowerBoundaryWaterLevels, properties.LowerBoundaryWaterLevels.Value, properties.LowerBoundaryWaterLevels.GetAccuracy());
             Assert.AreEqual(2, properties.LowerBoundaryWaterLevels.NumberOfDecimalPlaces);
             Assert.AreEqual(0.5, properties.StepSize.AsValue());
-            CollectionAssert.AreEqual(input.WaterLevels, properties.WaterLevels);
             Assert.IsInstanceOf<UseBreakWaterProperties>(properties.BreakWater);
             Assert.IsInstanceOf<UseForeshoreProperties>(properties.ForeshoreGeometry);
             Assert.AreEqual("Test", properties.RevetmentType);
@@ -345,6 +344,35 @@
         }
 
         [Test]
+        public void WaterLevels_WithValidData_ExpectedValues()
+        {
+            // Setup
+            var assessmentLevel = (RoundedDouble) 5.99;
+            var lowerBoundaryRevetment = (RoundedDouble) 3.58;
+            var lowerBoundaryWaterLevels = (RoundedDouble) 3.40;
+            var upperBoundaryRevetment = (RoundedDouble) 6.10;
+            var upperBoundaryWaterLevels = (RoundedDouble) 5.88;
+            const WaveConditionsInputStepSize stepSize = WaveConditionsInputStepSize.Half;
+
+            var input = new WaveConditionsInput
+            {
+                UpperBoundaryRevetment = upperBoundaryRevetment,
+                LowerBoundaryRevetment = lowerBoundaryRevetment,
+                UpperBoundaryWaterLevels = upperBoundaryWaterLevels,
+                LowerBoundaryWaterLevels = lowerBoundaryWaterLevels,
+                StepSize = stepSize
+            };
+            var inputContext = new TestWaveConditionsInputContext(input, new ForeshoreProfile[0], new HydraulicBoundaryLocation[0]);
+
+            // Call
+            var properties = new TestWaveConditionsInputContextProperties(inputContext, () => assessmentLevel, handler);
+
+            // Assert
+            Assert.IsNotEmpty(properties.WaterLevels);
+            CollectionAssert.AreEqual(input.GetWaterLevels(assessmentLevel), properties.WaterLevels);
+        }
+
+        [Test]
         public void SelectedHydraulicBoundaryLocation_Always_InputChangedAndObservablesNotified()
         {
             var propertiesSelectedHydraulicBoundaryLocation = new SelectableHydraulicBoundaryLocation(