Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs
===================================================================
diff -u -rd15d2685068662952431175bdca1fafb2e56da60 -rcb903e8cdb76e9733979fe508ee097107c022a28
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs	(.../HeightStructuresGuiPlugin.cs)	(revision d15d2685068662952431175bdca1fafb2e56da60)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresGuiPlugin.cs	(.../HeightStructuresGuiPlugin.cs)	(revision cb903e8cdb76e9733979fe508ee097107c022a28)
@@ -135,7 +135,8 @@
             };
         }
 
-        private static ExceedanceProbabilityCalculationActivity CreateHydraRingExceedenceProbabilityCalculationActivity(FailureMechanismSection failureMechanismSection,
+        private static ExceedanceProbabilityCalculationActivity CreateHydraRingExceedenceProbabilityCalculationActivity(ProbabilityAssessmentInput probabilityAssessmentInput,
+                                                                                                                        FailureMechanismSection failureMechanismSection,
                                                                                                                         string hlcdDirectory,
                                                                                                                         HeightStructuresCalculation calculation)
         {
@@ -167,14 +168,15 @@
                                                           inputParameters.DeviationOfTheWaveDirection,
                                                           inputParameters.StormDuration.Mean, inputParameters.StormDuration.StandardDeviation),
                 calculation.ClearOutput,
-                output => { ParseHydraRingOutput(calculation, output); });
+                output => { ParseHydraRingOutput(calculation, probabilityAssessmentInput, output); });
         }
 
         private void CalculateAll(HeightStructuresFailureMechanism failureMechanism, IEnumerable<HeightStructuresCalculation> calculations, IAssessmentSection assessmentSection)
         {
             // TODO: Remove "Where" filter when validation is implemented
             ActivityProgressDialogRunner.Run(Gui.MainWindow, calculations.Where(calc => calc.InputParameters.HydraulicBoundaryLocation != null)
                                                                          .Select(calc => CreateHydraRingExceedenceProbabilityCalculationActivity(
+                                                                             failureMechanism.ProbabilityAssessmentInput,
                                                                              failureMechanism.Sections.First(), // TODO: Pass dike section based on cross section of structure with reference line
                                                                              Path.GetDirectoryName(assessmentSection.HydraulicBoundaryDatabase.FilePath),
                                                                              calc)).ToList());
@@ -201,11 +203,11 @@
             return null;
         }
 
-        private static void ParseHydraRingOutput(HeightStructuresCalculation calculation, ExceedanceProbabilityCalculationOutput output)
+        private static void ParseHydraRingOutput(HeightStructuresCalculation calculation, ProbabilityAssessmentInput probabilityAssessmentInput, ExceedanceProbabilityCalculationOutput output)
         {
             if (output != null)
             {
-                calculation.Output = ProbabilityAssessmentService.Calculate(calculation.ProbabilityAssessmentInput, output.Beta);
+                calculation.Output = ProbabilityAssessmentService.Calculate(probabilityAssessmentInput, output.Beta);
                 calculation.NotifyObservers();
             }
             else
@@ -415,7 +417,7 @@
 
         private static void AddCalculation(HeightStructuresCalculationGroupContext context)
         {
-            var calculation = new HeightStructuresCalculation(context.FailureMechanism.GeneralInput, context.FailureMechanism.ProbabilityAssessmentInput)
+            var calculation = new HeightStructuresCalculation(context.FailureMechanism.GeneralInput)
             {
                 Name = NamingHelper.GetUniqueName(context.WrappedData.Children, HeightStructuresDataResources.HeightStructuresCalculation_DefaultName, c => c.Name)
             };
@@ -495,6 +497,7 @@
                 return;
             }
             var activity = CreateHydraRingExceedenceProbabilityCalculationActivity(
+                context.FailureMechanism.ProbabilityAssessmentInput,
                 context.FailureMechanism.Sections.First(), // TODO: Pass dike section based on cross section of calculation with reference line
                 Path.GetDirectoryName(context.AssessmentSection.HydraulicBoundaryDatabase.FilePath),
                 calculation);