Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresCalculationRow.cs
===================================================================
diff -u -r8b0586675f2855b447b7b801c2b701df8a7af9a2 -r2f428389ba5da6972410cd8f8d37784ac5cdff1c
--- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresCalculationRow.cs	(.../ClosingStructuresCalculationRow.cs)	(revision 8b0586675f2855b447b7b801c2b701df8a7af9a2)
+++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/Views/ClosingStructuresCalculationRow.cs	(.../ClosingStructuresCalculationRow.cs)	(revision 2f428389ba5da6972410cd8f8d37784ac5cdff1c)
@@ -227,7 +227,8 @@
 
         private void UpdateBreakWaterTypeAndHeightColumnStateDefinitions()
         {
-            if (!UseBreakWater)
+            ForeshoreProfile foreShoreProfileGeometry = Calculation.InputParameters.ForeshoreProfile;
+            if (!UseBreakWater || foreShoreProfileGeometry == null)
             {
                 ColumnStateHelper.DisableColumn(ColumnStateDefinitions[breakWaterTypeColumnIndex]);
                 ColumnStateHelper.DisableColumn(ColumnStateDefinitions[breakWaterHeightColumnIndex]);