Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_18.1_19.1.sql
===================================================================
diff -u -rdc03bf3b0e6ed80357f689c39eee30537718bd9e -r25304d085cb3f08a277a0a8f417d590ac5d02ba5
--- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_18.1_19.1.sql	(.../Migration_18.1_19.1.sql)	(revision dc03bf3b0e6ed80357f689c39eee30537718bd9e)
+++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_18.1_19.1.sql	(.../Migration_18.1_19.1.sql)	(revision 25304d085cb3f08a277a0a8f417d590ac5d02ba5)
@@ -340,7 +340,7 @@
 	[StepSize],
 	[CategoryType],
 	CASE
-		WHEN [HasOutput] = 1 
+		WHEN [HasOutput] = 1  AND (ValidForeshoreProfile = 1 OR ValidForeshoreProfile IS NULL)
 			THEN 2
 		ELSE 3
 	END
Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo191IntegrationTest.cs
===================================================================
diff -u -rd984bb4a0e5af8b6f2b65b2834f1b5b49b4a9ccb -r25304d085cb3f08a277a0a8f417d590ac5d02ba5
--- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo191IntegrationTest.cs	(.../MigrationTo191IntegrationTest.cs)	(revision d984bb4a0e5af8b6f2b65b2834f1b5b49b4a9ccb)
+++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo191IntegrationTest.cs	(.../MigrationTo191IntegrationTest.cs)	(revision 25304d085cb3f08a277a0a8f417d590ac5d02ba5)
@@ -298,7 +298,9 @@
                 "AND NEW.[LowerBoundaryWaterLevels] IS OLD.[LowerBoundaryWaterLevels] " +
                 "AND NEW.[StepSize] = OLD.[StepSize] " +
                 "AND NEW.[CategoryType] = OLD.[CategoryType] " +
-                "AND ((HasOutput = 1 AND NEW.[CalculationType] = 2) OR (HasOutput = 0 AND NEW.[CalculationType] = 3)); " +
+                "AND ((HasOutput = 1 AND HasValidForeshore = 1 AND NEW.[CalculationType] = 2)" +
+                "OR (HasOutput = 1 AND HasValidForeshore = 0 AND NEW.[CalculationType] = 3) " +
+                "OR (HasOutput = 0 AND NEW.[CalculationType] = 3)); " +
                 "DETACH SOURCEPROJECT;";
             reader.AssertReturnedDataIsValid(validateCalculationsWithForeshoreProfile);
         }