Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDataUpdateHandler.cs
===================================================================
diff -u -r5ae37d05a3861986f27c3c4927d5b6629c3340d2 -rb397945a3931595a6d3286520f6e4e4298552ab7
--- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDataUpdateHandler.cs	(.../HydraulicBoundaryDataUpdateHandler.cs)	(revision 5ae37d05a3861986f27c3c4927d5b6629c3340d2)
+++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDataUpdateHandler.cs	(.../HydraulicBoundaryDataUpdateHandler.cs)	(revision b397945a3931595a6d3286520f6e4e4298552ab7)
@@ -97,32 +97,24 @@
 
             var changedObjects = new List<IObservable>();
 
-            updateLocations = !hydraulicBoundaryData.IsLinked() || hydraulicBoundaryData.Version != readHydraulicBoundaryDatabase.Version;
+            
+            
+            hydraulicBoundaryData.FilePath = hrdFilePath;
+            hydraulicBoundaryData.Version = readHydraulicBoundaryDatabase.Version;
 
-            if (updateLocations)
-            {
-                hydraulicBoundaryData.FilePath = hrdFilePath;
-                hydraulicBoundaryData.Version = readHydraulicBoundaryDatabase.Version;
+            SetLocations(hydraulicBoundaryData, readHydraulicBoundaryDatabase.Locations,
+                         readHydraulicLocationConfigurationDatabase.ReadHydraulicLocations.Where(rhl => rhl.TrackId == readHydraulicBoundaryDatabase.TrackId),
+                         excludedLocationIds.ToArray());
 
-                SetLocations(hydraulicBoundaryData, readHydraulicBoundaryDatabase.Locations,
-                             readHydraulicLocationConfigurationDatabase.ReadHydraulicLocations.Where(rhl => rhl.TrackId == readHydraulicBoundaryDatabase.TrackId),
-                             excludedLocationIds.ToArray());
+            assessmentSection.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryData.Locations);
 
-                assessmentSection.SetHydraulicBoundaryLocationCalculations(hydraulicBoundaryData.Locations);
+            duneLocationsReplacementHandler.Replace(hydraulicBoundaryData.Locations);
 
-                duneLocationsReplacementHandler.Replace(hydraulicBoundaryData.Locations);
+            changedObjects.AddRange(GetLocationsAndCalculationsObservables(hydraulicBoundaryData));
+            changedObjects.AddRange(RiskeerDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(assessmentSection));
 
-                changedObjects.AddRange(GetLocationsAndCalculationsObservables(hydraulicBoundaryData));
-                changedObjects.AddRange(RiskeerDataSynchronizationService.ClearAllCalculationOutputAndHydraulicBoundaryLocations(assessmentSection));
-            }
-            else
-            {
-                if (hydraulicBoundaryData.FilePath != hrdFilePath)
-                {
-                    hydraulicBoundaryData.FilePath = hrdFilePath;
-                }
-            }
-
+            
+            
             return changedObjects;
         }