Index: Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_18.1_19.1.sql
===================================================================
diff -u -r92c8f415e9c5528671ef10cd610f1868dca7659b -r94e33822a51e65c3a837e83556ffd9b83bfae888
--- Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_18.1_19.1.sql	(.../Migration_18.1_19.1.sql)	(revision 92c8f415e9c5528671ef10cd610f1868dca7659b)
+++ Riskeer/Migration/src/Riskeer.Migration.Core/EmbeddedResources/Migration_18.1_19.1.sql	(.../Migration_18.1_19.1.sql)	(revision 94e33822a51e65c3a837e83556ffd9b83bfae888)
@@ -449,7 +449,12 @@
 		ELSE 
 			[UseForeshore]
 	END,
-	[Orientation],
+	CASE 
+		WHEN ValidForeshoreProfile = 0
+			THEN NULL
+		ELSE 
+			[Orientation]
+	END,
 	[UpperBoundaryRevetment],
 	[LowerBoundaryRevetment],
 	[UpperBoundaryWaterLevels],
@@ -921,7 +926,12 @@
 		ELSE 
 			[UseForeshore]
 	END,
-	[Orientation],
+	CASE 
+		WHEN ValidForeshoreProfile = 0
+			THEN NULL
+		ELSE 
+			[Orientation]
+	END,
 	[UpperBoundaryRevetment],
 	[LowerBoundaryRevetment],
 	[UpperBoundaryWaterLevels],
@@ -1019,7 +1029,12 @@
 		ELSE 
 			[UseForeshore]
 	END,
-	[Orientation],
+	CASE 
+		WHEN ValidForeshoreProfile = 0
+			THEN NULL
+		ELSE 
+			[Orientation]
+	END,
 	[UpperBoundaryRevetment],
 	[LowerBoundaryRevetment],
 	[UpperBoundaryWaterLevels],
Index: Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo191IntegrationTest.cs
===================================================================
diff -u -r92c8f415e9c5528671ef10cd610f1868dca7659b -r94e33822a51e65c3a837e83556ffd9b83bfae888
--- Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo191IntegrationTest.cs	(.../MigrationTo191IntegrationTest.cs)	(revision 92c8f415e9c5528671ef10cd610f1868dca7659b)
+++ Riskeer/Migration/test/Riskeer.Migration.Integration.Test/MigrationTo191IntegrationTest.cs	(.../MigrationTo191IntegrationTest.cs)	(revision 94e33822a51e65c3a837e83556ffd9b83bfae888)
@@ -399,6 +399,7 @@
                 "AND NEW.\"Order\" = OLD.\"Order\" " +
                 "AND NEW.[Name] IS OLD.[Name] " +
                 "AND NEW.[Comments] IS OLD.[Comments] " +
+                "AND NEW.[Orientation] IS OLD.[Orientation] " +
                 "AND NEW.[UseBreakWater] = OLD.[UseBreakWater] " +
                 "AND NEW.[BreakWaterType] = OLD.[BreakWaterType] " +
                 "AND NEW.[BreakWaterHeight] IS OLD.[BreakWaterHeight] " +
@@ -468,7 +469,7 @@
                 "AND (HasValidForeshore = 1 AND NEW.[BreakWaterType] = OLD.[BreakWaterType]) OR (HasValidForeshore = 0 AND NEW.[BreakWaterType] = 3) " +
                 "AND (HasValidForeshore = 1 AND NEW.[BreakWaterHeight] IS OLD.[BreakWaterHeight]) OR (HasValidForeshore = 0 AND NEW.[BreakWaterHeight] IS NULL) " +
                 "AND (HasValidForeshore = 1 AND NEW.[UseForeshore] = OLD.[UseForeshore]) OR (HasValidForeshore = 0 AND NEW.[UseForeshore] = 0) " +
-                "AND NEW.[Orientation] IS OLD.[Orientation] " +
+                "AND (HasValidForeshore = 1 AND NEW.[Orientation] IS OLD.[Orientation]) OR (HasValidForeshore = 0 AND NEW.[Orientation] IS NULL) " +
                 "AND NEW.[UpperBoundaryRevetment] IS OLD.[UpperBoundaryRevetment] " +
                 "AND NEW.[LowerBoundaryRevetment] IS OLD.[LowerBoundaryRevetment] " +
                 "AND NEW.[UpperBoundaryWaterLevels] IS OLD.[UpperBoundaryWaterLevels] " +
@@ -556,7 +557,7 @@
                 "AND NEW.\"Order\" = OLD.\"Order\" " +
                 "AND NEW.[Name] IS OLD.[Name] " +
                 "AND NEW.[Comments] IS OLD.[Comments] " +
-                "AND NEW.[Orientation] IS OLD.[Orientation] " +
+                "AND NEW.[Orientation] IS NULL " +
                 "AND NEW.[UpperBoundaryRevetment] IS OLD.[UpperBoundaryRevetment] " +
                 "AND NEW.[LowerBoundaryRevetment] IS OLD.[LowerBoundaryRevetment] " +
                 "AND NEW.[UpperBoundaryWaterLevels] IS OLD.[UpperBoundaryWaterLevels] " +
@@ -597,6 +598,7 @@
                 "AND NEW.\"Order\" = OLD.\"Order\" " +
                 "AND NEW.[Name] IS OLD.[Name] " +
                 "AND NEW.[Comments] IS OLD.[Comments] " +
+                "AND NEW.[Orientation] IS OLD.[Orientation] " +
                 "AND NEW.[UseBreakWater] =  OLD.[UseBreakWater] " +
                 "AND NEW.[UpperBoundaryRevetment] IS OLD.[UpperBoundaryRevetment] " +
                 "AND NEW.[LowerBoundaryRevetment] IS OLD.[LowerBoundaryRevetment] " +
@@ -613,7 +615,7 @@
                 "AND NEW.\"Order\" = OLD.\"Order\" " +
                 "AND NEW.[Name] IS OLD.[Name] " +
                 "AND NEW.[Comments] IS OLD.[Comments] " +
-                "AND NEW.[Orientation] IS OLD.[Orientation] " +
+                "AND NEW.[Orientation] IS NULL " +
                 "AND NEW.[UpperBoundaryRevetment] IS OLD.[UpperBoundaryRevetment] " +
                 "AND NEW.[LowerBoundaryRevetment] IS OLD.[LowerBoundaryRevetment] " +
                 "AND NEW.[UpperBoundaryWaterLevels] IS OLD.[UpperBoundaryWaterLevels] " +