Index: Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs
===================================================================
diff -u -r54849f8ce3cfae577acc05f00274fbd51cad2836 -r002e9281d19ff2a4f9c0476587983092d36786cc
--- Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs	(.../HydraulicBoundaryDatabaseImporter.cs)	(revision 54849f8ce3cfae577acc05f00274fbd51cad2836)
+++ Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDatabaseImporter.cs	(.../HydraulicBoundaryDatabaseImporter.cs)	(revision 002e9281d19ff2a4f9c0476587983092d36786cc)
@@ -260,12 +260,15 @@
                                                                                                  ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase,
                                                                                                  long[] readExcludedLocationIds)
         {
+            ReadHydraulicLocation[] readHydraulicLocations = readHydraulicLocationConfigurationDatabase.ReadHydraulicLocations
+                                                                                                       .Where(rhl => rhl.TrackId == readHydraulicBoundaryDatabase.TrackId)
+                                                                                                       .ToArray();
+
             foreach (ReadHydraulicBoundaryLocation readHydraulicBoundaryLocation in readHydraulicBoundaryDatabase.Locations)
             {
-                long hydraulicBoundaryLocationId = readHydraulicLocationConfigurationDatabase.ReadHydraulicLocations
-                                                                                             .Where(m => m.HrdLocationId == readHydraulicBoundaryLocation.Id)
-                                                                                             .Select(m => m.HlcdLocationId)
-                                                                                             .FirstOrDefault();
+                long hydraulicBoundaryLocationId = readHydraulicLocations.Where(m => m.HrdLocationId == readHydraulicBoundaryLocation.Id)
+                                                                         .Select(m => m.HlcdLocationId)
+                                                                         .FirstOrDefault();
 
                 if (hydraulicBoundaryLocationId != 0 && !readExcludedLocationIds.Contains(hydraulicBoundaryLocationId))
                 {
Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs
===================================================================
diff -u -r64f4a3d32b741b7db24e8acfb58b4f2f1433b8a1 -r002e9281d19ff2a4f9c0476587983092d36786cc
--- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 64f4a3d32b741b7db24e8acfb58b4f2f1433b8a1)
+++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 002e9281d19ff2a4f9c0476587983092d36786cc)
@@ -363,7 +363,7 @@
 
             HydraulicBoundaryData hydraulicBoundaryData = CreateLinkedHydraulicBoundaryData();
 
-            hydraulicBoundaryData.Locations.Add(new HydraulicBoundaryLocation(100001, "Test", 2, 3));
+            hydraulicBoundaryData.Locations.Add(new HydraulicBoundaryLocation(1300001, "Test", 2, 3));
 
             var importer = new HydraulicBoundaryDatabaseImporter(hydraulicBoundaryData, handler, validHrdFilePath);