Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs
===================================================================
diff -u -r5ef2f44bca31b92735dff724f97b717c7c55f912 -r0f52cc27207fe619f81aea263c5304fa94e1d4a8
--- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs	(.../WaveConditionsInputView.cs)	(revision 5ef2f44bca31b92735dff724f97b717c7c55f912)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/Views/WaveConditionsInputView.cs	(.../WaveConditionsInputView.cs)	(revision 0f52cc27207fe619f81aea263c5304fa94e1d4a8)
@@ -147,6 +147,7 @@
         {
             calculationObserver.Dispose();
             calculationInputObserver.Dispose();
+            hydraulicBoundaryLocationCalculationObserver.Dispose();
 
             if (disposing)
             {
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs
===================================================================
diff -u -ra9ba8ec0cfdfc488fe5daa645e44047c056a203b -r0f52cc27207fe619f81aea263c5304fa94e1d4a8
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs	(.../WaveConditionsInputViewTest.cs)	(revision a9ba8ec0cfdfc488fe5daa645e44047c056a203b)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs	(.../WaveConditionsInputViewTest.cs)	(revision 0f52cc27207fe619f81aea263c5304fa94e1d4a8)
@@ -56,26 +56,6 @@
         private const int revetmentBaseChartDataIndex = 7;
         private const int revetmentChartDataIndex = 8;
 
-        private static IEnumerable<TestCaseData> NotifyChange
-        {
-            get
-            {
-                yield return new TestCaseData(new Action<WaveConditionsInput>(wci =>
-                {
-                    var newLocation = new TestHydraulicBoundaryLocation();
-                    wci.HydraulicBoundaryLocation = newLocation;
-                    wci.NotifyObservers();
-                })).SetName("NotifyLocationAndWaterLevelChange");
-
-                yield return new TestCaseData(new Action<WaveConditionsInput>(wci =>
-                {
-                    var newLocation = new TestHydraulicBoundaryLocation();
-                    wci.HydraulicBoundaryLocation = newLocation;
-                    wci.NotifyObservers();
-                })).SetName("NotifyLocationChange");
-            }
-        }
-
         [Test]
         public void Constructor_InputViewStyleNull_ThrowArgumentNullException()
         {
@@ -540,8 +520,6 @@
 
                 // When
                 assessmentLevel = (RoundedDouble) 8;
-                var newLocation = new TestHydraulicBoundaryLocation();
-                calculation.InputParameters.HydraulicBoundaryLocation = newLocation;
                 calculation.InputParameters.NotifyObservers();
 
                 // Then