Index: Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryLocationCalculationActivityFactory.cs
===================================================================
diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -r467d917ea36ad0305209c9b01f00a5454749bc23
--- Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryLocationCalculationActivityFactory.cs	(.../HydraulicBoundaryLocationCalculationActivityFactory.cs)	(revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3)
+++ Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryLocationCalculationActivityFactory.cs	(.../HydraulicBoundaryLocationCalculationActivityFactory.cs)	(revision 467d917ea36ad0305209c9b01f00a5454749bc23)
@@ -61,9 +61,10 @@
                 throw new ArgumentNullException(nameof(calculations));
             }
 
-            HydraulicBoundaryCalculationSettings settings = HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryData);
             return calculations.Select(calculation => new WaveHeightCalculationActivity(calculation,
-                                                                                        settings,
+                                                                                        HydraulicBoundaryCalculationSettingsFactory.CreateSettings(
+                                                                                            assessmentSection.HydraulicBoundaryData,
+                                                                                            calculation.HydraulicBoundaryLocation),
                                                                                         targetProbability,
                                                                                         calculationIdentifier)).ToArray();
         }
@@ -96,9 +97,10 @@
                 throw new ArgumentNullException(nameof(calculations));
             }
 
-            HydraulicBoundaryCalculationSettings settings = HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryData);
             return calculations.Select(calculation => new DesignWaterLevelCalculationActivity(calculation,
-                                                                                              settings,
+                                                                                              HydraulicBoundaryCalculationSettingsFactory.CreateSettings(
+                                                                                                  assessmentSection.HydraulicBoundaryData,
+                                                                                                  calculation.HydraulicBoundaryLocation),
                                                                                               targetProbability,
                                                                                               calculationIdentifier)).ToArray();
         }