Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -rf4dd417401193ac7ae205acb1b38ad6155b9134f -r0ac7450f53970c5742d115164a02e2304c0ce9d3
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision f4dd417401193ac7ae205acb1b38ad6155b9134f)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 0ac7450f53970c5742d115164a02e2304c0ce9d3)
@@ -442,21 +442,19 @@
             {
                 Text = designWaterLevel => RingtoetsFormsResources.DesignWaterLevel_DisplayName,
                 Image = designWaterLevel => RingtoetsCommonFormsResources.GenericInputOutputIcon,
-                ForeColor = context => context.WrappedData.HydraulicBoundaryDatabase != null &&
-                                       context.WrappedData.HydraulicBoundaryDatabase.Locations.Any(l => !double.IsNaN(l.DesignWaterLevel)) ?
-                                           Color.FromKnownColor(KnownColor.ControlText) :
-                                           Color.FromKnownColor(KnownColor.GrayText),
+                ForeColor = context => context.WrappedData.HydraulicBoundaryDatabase == null ?
+                                           Color.FromKnownColor(KnownColor.GrayText) :
+                                           Color.FromKnownColor(KnownColor.ControlText),
                 ContextMenuStrip = DesignWaterLevelContextMenuStrip
             };
 
             yield return new TreeNodeInfo<WaveHeightContext>
             {
                 Text = waveHeight => RingtoetsFormsResources.WaveHeightContext_DisplayName,
                 Image = waveHeight => RingtoetsCommonFormsResources.GenericInputOutputIcon,
-                ForeColor = context => context.WrappedData.HydraulicBoundaryDatabase != null &&
-                                       context.WrappedData.HydraulicBoundaryDatabase.Locations.Any(l => !double.IsNaN(l.WaveHeight)) ?
-                                           Color.FromKnownColor(KnownColor.ControlText) :
-                                           Color.FromKnownColor(KnownColor.GrayText),
+                ForeColor = context => context.WrappedData.HydraulicBoundaryDatabase == null ?
+                                           Color.FromKnownColor(KnownColor.GrayText) :
+                                           Color.FromKnownColor(KnownColor.ControlText),
                 ContextMenuStrip = WaveHeightContextMenuStrip
             };