Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -rb32ec68f52968bc821b67cd973544bc2d0e7d568 -r5cf6fd5b4bd57890b104182c35fff4180b9d7aba
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision b32ec68f52968bc821b67cd973544bc2d0e7d568)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs	(.../RingtoetsPlugin.cs)	(revision 5cf6fd5b4bd57890b104182c35fff4180b9d7aba)
@@ -1025,8 +1025,24 @@
                 RingtoetsFormsResources.WaveHeight_Calculate,
                 RingtoetsFormsResources.WaveHeight_Calculate_ToolTip,
                 RingtoetsCommonFormsResources.FailureMechanismIcon,
-                null);
+                (sender, args) =>
+                {
+                    var hrdFile = nodeData.WrappedData.HydraulicBoundaryDatabase.FilePath;
+                    var validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(hrdFile);
+                    if (validationProblem == null)
+                    {
+                        var activities = nodeData.WrappedData.HydraulicBoundaryDatabase.Locations.Select(hbl => new WaveHeightCalculationActivity(nodeData.WrappedData, hbl)).ToArray();
 
+                        ActivityProgressDialogRunner.Run(Gui.MainWindow, activities);
+
+                        nodeData.WrappedData.NotifyObservers();
+                    }
+                    else
+                    {
+                        log.ErrorFormat(Resources.RingtoetsPlugin_HydraulicBoundaryDatabaseContextMenuStrip_Start_calculation_failed_0_, validationProblem);
+                    }
+                });
+
             if (nodeData.WrappedData.HydraulicBoundaryDatabase == null)
             {
                 waveHeightItem.Enabled = false;