Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneLocationCalculationActivityFactory.cs
===================================================================
diff -u -r52c3d6c3c369cbdb020756c537ab5c6cea4c5514 -r879a99f2d7173df5b003b4feb694cadcacd54f6d
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneLocationCalculationActivityFactory.cs	(.../DuneLocationCalculationActivityFactory.cs)	(revision 52c3d6c3c369cbdb020756c537ab5c6cea4c5514)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Service/DuneLocationCalculationActivityFactory.cs	(.../DuneLocationCalculationActivityFactory.cs)	(revision 879a99f2d7173df5b003b4feb694cadcacd54f6d)
@@ -63,9 +63,9 @@
                 throw new ArgumentNullException(nameof(assessmentSection));
             }
 
-            HydraulicBoundaryCalculationSettings settings = HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryDatabase);
             return calculations.Select(calculation => new DuneLocationCalculationActivity(calculation,
-                                                                                          settings,
+                                                                                          HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection,
+                                                                                                                                                     GetCorrespondingHydraulicBoundaryLocation(calculation, assessmentSection)),
                                                                                           norm,
                                                                                           categoryBoundaryName)).ToArray();
         }
@@ -125,5 +125,10 @@
 
             return activities;
         }
+
+        private static HydraulicBoundaryLocation GetCorrespondingHydraulicBoundaryLocation(DuneLocationCalculation calculation, IAssessmentSection assessmentSection)
+        {
+            return assessmentSection.HydraulicBoundaryDatabases.SelectMany(hbd => hbd.Locations).First(hbl => hbl.Id.Equals(calculation.DuneLocation.Id));
+        }
     }
 }
\ No newline at end of file