Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/HydraulicBoundaryDatabaseImporter.cs
===================================================================
diff -u -r78a65c9ba318c526d4a6b73e3633632b11e7bf02 -r19e9491faa97f74a8e2a0533fbbaf34074549419
--- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/HydraulicBoundaryDatabaseImporter.cs	(.../HydraulicBoundaryDatabaseImporter.cs)	(revision 78a65c9ba318c526d4a6b73e3633632b11e7bf02)
+++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/HydraulicBoundaryDatabaseImporter.cs	(.../HydraulicBoundaryDatabaseImporter.cs)	(revision 19e9491faa97f74a8e2a0533fbbaf34074549419)
@@ -74,7 +74,6 @@
                 if (hydraulicBoundaryDatabase.FilePath != filePath)
                 {
                     hydraulicBoundaryDatabase.FilePath = filePath;
-                    assessmentSection.NotifyObservers();
                     hydraulicBoundaryDatabase.NotifyObservers();
                 }
             }
@@ -103,7 +102,6 @@
                     hydraulicBoundaryDatabase.CanUsePreprocessor = false;
                 }
 
-                assessmentSection.NotifyObservers();
                 hydraulicBoundaryDatabase.NotifyObservers();
                 hydraulicBoundaryDatabase.Locations.NotifyObservers();
 
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs
===================================================================
diff -u -r39e18750ccb61ad1f367279f9dac39a232d4f843 -r19e9491faa97f74a8e2a0533fbbaf34074549419
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 39e18750ccb61ad1f367279f9dac39a232d4f843)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/HydraulicBoundaryDatabaseImporterTest.cs	(.../HydraulicBoundaryDatabaseImporterTest.cs)	(revision 19e9491faa97f74a8e2a0533fbbaf34074549419)
@@ -193,7 +193,6 @@
             // Setup
             var mocks = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mocks);
-            assessmentSection.Expect(section => section.NotifyObservers());
 
             var databaseObserver = mocks.StrictMock<IObserver>();
             databaseObserver.Expect(o => o.UpdateObserver());
@@ -232,7 +231,6 @@
             // Setup
             var mocks = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mocks);
-            assessmentSection.Expect(section => section.NotifyObservers());
 
             var databaseObserver = mocks.StrictMock<IObserver>();
             databaseObserver.Expect(o => o.UpdateObserver());
@@ -273,7 +271,6 @@
             // Given
             var mocks = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mocks);
-            assessmentSection.Expect(section => section.NotifyObservers()).Repeat.Twice(); // Needed for first import
 
             var databaseObserver = mocks.StrictMock<IObserver>();
             databaseObserver.Expect(o => o.UpdateObserver());
@@ -307,7 +304,6 @@
             // Given
             var mocks = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(mocks);
-            assessmentSection.Expect(section => section.NotifyObservers()); // Expectation from first import
 
             var databaseObserver = mocks.StrictMock<IObserver>();
             var locationsObserver = mocks.StrictMock<IObserver>();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs
===================================================================
diff -u -r39e18750ccb61ad1f367279f9dac39a232d4f843 -r19e9491faa97f74a8e2a0533fbbaf34074549419
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 39e18750ccb61ad1f367279f9dac39a232d4f843)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs	(.../HydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs)	(revision 19e9491faa97f74a8e2a0533fbbaf34074549419)
@@ -266,9 +266,12 @@
         public void GivenNoDatabaseLinked_WhenOpeningValidFileFromContextMenu_ThenDatabaseLinkedObserversNotifiedAndLogMessagesAdded()
         {
             // Given
-            var assessmentSectionObserver = mocks.StrictMock<IObserver>();
-            assessmentSectionObserver.Expect(o => o.UpdateObserver());
+            var hydraulicBoundaryDatabaseObserver = mocks.StrictMock<IObserver>();
+            hydraulicBoundaryDatabaseObserver.Expect(o => o.UpdateObserver());
 
+            var hydraulicBoundaryLocationsObserver = mocks.StrictMock<IObserver>();
+            hydraulicBoundaryLocationsObserver.Expect(o => o.UpdateObserver());
+
             var grassCoverErosionOutwardsLocationsObserver = mocks.StrictMock<IObserver>();
             grassCoverErosionOutwardsLocationsObserver.Expect(o => o.UpdateObserver());
 
@@ -291,7 +294,8 @@
                 gui.Stub(cmp => cmp.Get(hydraulicBoundaryDatabaseContext, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder());
                 mocks.ReplayAll();
 
-                assessmentSection.Attach(assessmentSectionObserver);
+                assessmentSection.HydraulicBoundaryDatabase.Attach(hydraulicBoundaryDatabaseObserver);
+                assessmentSection.HydraulicBoundaryDatabase.Locations.Attach(hydraulicBoundaryLocationsObserver);
                 assessmentSection.GrassCoverErosionOutwards.HydraulicBoundaryLocations.Attach(grassCoverErosionOutwardsLocationsObserver);
 
                 DialogBoxHandler = (name, wnd) =>