Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs
===================================================================
diff -u -r6d0d122d4f56b79e5c0157702d85463588496b41 -r4e9fa1035d526d5f997e7792a21b54e55766e93b
--- Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs	(.../AssessmentSectionCreateExtensions.cs)	(revision 6d0d122d4f56b79e5c0157702d85463588496b41)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/AssessmentSectionCreateExtensions.cs	(.../AssessmentSectionCreateExtensions.cs)	(revision 4e9fa1035d526d5f997e7792a21b54e55766e93b)
@@ -81,7 +81,7 @@
                 Order = order
             };
 
-            AddEntityForHydraulicDatabase(section.HydraulicBoundaryDatabase, entity, registry);
+            AddEntityForHydraulicDatabase(section, entity, registry);
             AddHydraulicLocationCalculationEntities(section, entity, registry);
             AddEntityForReferenceLine(section, entity);
 
@@ -117,9 +117,9 @@
             }
         }
 
-        private static void AddEntityForHydraulicDatabase(HydraulicBoundaryDatabase hydraulicBoundaryDatabase, AssessmentSectionEntity entity, PersistenceRegistry registry)
+        private static void AddEntityForHydraulicDatabase(AssessmentSection assessmentSection, AssessmentSectionEntity entity, PersistenceRegistry registry)
         {
-            if (hydraulicBoundaryDatabase.IsLinked())
+            foreach (HydraulicBoundaryDatabase hydraulicBoundaryDatabase in assessmentSection.HydraulicBoundaryDatabases)
             {
                 entity.HydraulicBoundaryDatabaseEntities.Add(hydraulicBoundaryDatabase.Create(registry));
             }
Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs
===================================================================
diff -u -rfe71ea7dedd124845b91ad5a3d82113935d04cb8 -r4e9fa1035d526d5f997e7792a21b54e55766e93b
--- Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs	(.../AssessmentSectionEntityReadExtensions.cs)	(revision fe71ea7dedd124845b91ad5a3d82113935d04cb8)
+++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs	(.../AssessmentSectionEntityReadExtensions.cs)	(revision 4e9fa1035d526d5f997e7792a21b54e55766e93b)
@@ -116,8 +116,7 @@
 
         private static void ReadHydraulicDatabase(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector)
         {
-            HydraulicBoundaryDatabaseEntity hydraulicBoundaryDatabaseEntity = entity.HydraulicBoundaryDatabaseEntities.SingleOrDefault();
-            if (hydraulicBoundaryDatabaseEntity != null)
+            foreach (HydraulicBoundaryDatabaseEntity hydraulicBoundaryDatabaseEntity in entity.HydraulicBoundaryDatabaseEntities)
             {
                 HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase;
                 hydraulicBoundaryDatabaseEntity.Read(hydraulicBoundaryDatabase);