Index: Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataSynchronizationService.cs
===================================================================
diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r87aafc58782eb7ce49b1e06b1db2feda8cd85948
--- Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataSynchronizationService.cs	(.../RingtoetsCommonDataSynchronizationService.cs)	(revision e182f6f394aa75e739467a77e7bcacd9a8b25429)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/RingtoetsCommonDataSynchronizationService.cs	(.../RingtoetsCommonDataSynchronizationService.cs)	(revision 87aafc58782eb7ce49b1e06b1db2feda8cd85948)
@@ -24,7 +24,6 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 using Core.Common.Base;
-using Core.Common.Base.Data;
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Data.Calculation;
 using Ringtoets.Common.Data.DikeProfiles;
@@ -102,13 +101,10 @@
 
         private static IEnumerable<IObservable> ClearHydraulicBoundaryLocationOutput(HydraulicBoundaryLocation location)
         {
-            if (!double.IsNaN(location.DesignWaterLevel) ||
-                !double.IsNaN(location.WaveHeight))
+            if (location.DesignWaterLevelOutput != null || location.WaveHeightOutput != null)
             {
-                location.DesignWaterLevel = RoundedDouble.NaN;
-                location.WaveHeight = RoundedDouble.NaN;
-                location.DesignWaterLevelCalculationConvergence = CalculationConvergence.NotCalculated;
-                location.WaveHeightCalculationConvergence = CalculationConvergence.NotCalculated;
+                location.DesignWaterLevelOutput = null;
+                location.WaveHeightOutput = null;
 
                 return new[]
                 {