Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationRow.cs
===================================================================
diff -u -r36a0cf79588c3a06c0091e030f5b8fcc1b945a4d -r8f9f7129237688231085d3299354760fb761010e
--- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationRow.cs	(.../HeightStructuresCalculationRow.cs)	(revision 36a0cf79588c3a06c0091e030f5b8fcc1b945a4d)
+++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/Views/HeightStructuresCalculationRow.cs	(.../HeightStructuresCalculationRow.cs)	(revision 8f9f7129237688231085d3299354760fb761010e)
@@ -212,7 +212,8 @@
 
         private void UpdateBreakWaterTypeAndHeightColumnStateDefinitions()
         {
-            if (!UseBreakWater)
+            ForeshoreProfile foreShoreProfileGeometry = Calculation.InputParameters.ForeshoreProfile;
+            if (!UseBreakWater || foreShoreProfileGeometry == null)
             {
                 ColumnStateHelper.DisableColumn(ColumnStateDefinitions[breakWaterTypeColumnIndex]);
                 ColumnStateHelper.DisableColumn(ColumnStateDefinitions[breakWaterHeightColumnIndex]);