Index: Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs
===================================================================
diff -u -r76948e8765899b35776102ecd211d3d7575a9e4d -rb341b132f7007d3f007d19872c0970292edd0d63
--- Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision 76948e8765899b35776102ecd211d3d7575a9e4d)
+++ Ringtoets/Common/src/Ringtoets.Common.Service/WaveHeightCalculationActivity.cs	(.../WaveHeightCalculationActivity.cs)	(revision b341b132f7007d3f007d19872c0970292edd0d63)
@@ -112,7 +112,9 @@
         {
             get
             {
-                return !double.IsNaN(hydraulicBoundaryLocation.WaveHeight);
+                HydraulicBoundaryLocationCalculation calculation = hydraulicBoundaryLocation.WaveHeightCalculation;
+                return calculation.HasOutput
+                       && calculation.InputParameters.ShouldIllustrationPointsBeCalculated == calculation.Output.HasIllustrationPoints;
             }
         }
     }