Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs
===================================================================
diff -u -rd1519950f365a9a8d3f4f75186f73e98a6ac6b51 -rdaabed4b97870ad8eeccbaaa6d84ce1dc0b81ec2
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs	(.../MacroStabilityInwardsCalculationEntityReadExtensions.cs)	(revision d1519950f365a9a8d3f4f75186f73e98a6ac6b51)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensions.cs	(.../MacroStabilityInwardsCalculationEntityReadExtensions.cs)	(revision daabed4b97870ad8eeccbaaa6d84ce1dc0b81ec2)
@@ -142,17 +142,12 @@
                                                                           ReadConversionCollector collector)
         {
             inputParameters.UseAssessmentLevelManualInput = Convert.ToBoolean(entity.UseAssessmentLevelManualInput);
-            if (inputParameters.UseAssessmentLevelManualInput)
+            inputParameters.AssessmentLevel = (RoundedDouble) entity.AssessmentLevel.ToNullAsNaN();
+
+            if (entity.HydraulicLocationEntity != null)
             {
-                inputParameters.AssessmentLevel = (RoundedDouble) entity.AssessmentLevel.ToNullAsNaN();
+                inputParameters.HydraulicBoundaryLocation = entity.HydraulicLocationEntity.Read(collector);
             }
-            else
-            {
-                if (entity.HydraulicLocationEntity != null)
-                {
-                    inputParameters.HydraulicBoundaryLocation = entity.HydraulicLocationEntity.Read(collector);
-                }
-            }
         }
 
         private static void SetStochasticSoilModelToInput(MacroStabilityInwardsInput inputParameters,
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -rd1519950f365a9a8d3f4f75186f73e98a6ac6b51 -rdaabed4b97870ad8eeccbaaa6d84ce1dc0b81ec2
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs	(.../MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs)	(revision d1519950f365a9a8d3f4f75186f73e98a6ac6b51)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacroStabilityInwards/MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs	(.../MacroStabilityInwardsCalculationEntityReadExtensionsTest.cs)	(revision daabed4b97870ad8eeccbaaa6d84ce1dc0b81ec2)
@@ -55,7 +55,9 @@
         }
 
         [Test]
-        public void Read_EntityWithValidValues_ReturnsCalculationScenarioWithExpectedValues()
+        [TestCase(true)]
+        [TestCase(false)]
+        public void Read_EntityWithValidValues_ReturnsCalculationScenarioWithExpectedValues(bool useAssessmentLevelManualInput)
         {
             // Setup
             var random = new Random(21);
@@ -64,7 +66,7 @@
                 Name = "Calculation name",
                 Comment = "Comment here",
                 AssessmentLevel = random.NextDouble(),
-                UseAssessmentLevelManualInput = Convert.ToByte(true),
+                UseAssessmentLevelManualInput = Convert.ToByte(useAssessmentLevelManualInput),
                 ScenarioContribution = random.NextDouble(),
                 RelevantForScenario = Convert.ToByte(random.NextBoolean()),
                 SlipPlaneMinimumDepth = random.NextDouble(),