Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs
===================================================================
diff -u -ra1660e4c72d2ba7a6c97dff29ca732ee292af5f4 -r9fd3e67b9289d82d9c8a6cb1cd6312061761a207
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs	(.../GrassCoverErosionInwardsCalculation.cs)	(revision a1660e4c72d2ba7a6c97dff29ca732ee292af5f4)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs	(.../GrassCoverErosionInwardsCalculation.cs)	(revision 9fd3e67b9289d82d9c8a6cb1cd6312061761a207)
@@ -57,10 +57,9 @@
         {
             get
             {
-                return !HasOutput
-                       || Output.OvertoppingOutput.HasGeneralResult != InputParameters.ShouldOvertoppingOutputIllustrationPointsBeCalculated
-                       || Output.DikeHeightOutput.HasGeneralResult != InputParameters.ShouldDikeHeightIllustrationPointsBeCalculated
-                       || Output.OvertoppingRateOutput.HasGeneralResult != InputParameters.ShouldOvertoppingRateIllustrationPointsBeCalculated;
+                return ShouldCalculateOvertopping()
+                       || ShouldCalculateDikeHeight()
+                       || ShouldCalculateOvertoppingRate();
             }
         }
 
@@ -102,5 +101,26 @@
         {
             Output = null;
         }
+
+        private bool ShouldCalculateOvertopping()
+        {
+            return !HasOutput || Output.OvertoppingOutput.HasGeneralResult != InputParameters.ShouldOvertoppingOutputIllustrationPointsBeCalculated;
+        }
+
+        private bool ShouldCalculateDikeHeight()
+        {
+            return HasOutput
+                   && InputParameters.DikeHeightCalculationType != DikeHeightCalculationType.NoCalculation
+                   && (Output.DikeHeightOutput == null
+                       || Output.DikeHeightOutput.HasGeneralResult != InputParameters.ShouldDikeHeightIllustrationPointsBeCalculated);
+        }
+
+        private bool ShouldCalculateOvertoppingRate()
+        {
+            return HasOutput
+                   && InputParameters.OvertoppingRateCalculationType != OvertoppingRateCalculationType.NoCalculation
+                   && (Output.OvertoppingRateOutput == null
+                       || Output.OvertoppingRateOutput.HasGeneralResult != InputParameters.ShouldOvertoppingRateIllustrationPointsBeCalculated);
+        }
     }
 }
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs
===================================================================
diff -u -r07f3d67fe9512b3c8303ff09398b0a234900d546 -r9fd3e67b9289d82d9c8a6cb1cd6312061761a207
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs	(.../GrassCoverErosionInwardsOutput.cs)	(revision 07f3d67fe9512b3c8303ff09398b0a234900d546)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsOutput.cs	(.../GrassCoverErosionInwardsOutput.cs)	(revision 9fd3e67b9289d82d9c8a6cb1cd6312061761a207)
@@ -46,6 +46,7 @@
             {
                 throw new ArgumentNullException(nameof(overtoppingOutput));
             }
+
             OvertoppingOutput = overtoppingOutput;
             DikeHeightOutput = dikeHeightOutput;
             OvertoppingRateOutput = overtoppingRateOutput;