Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs
===================================================================
diff -u -r614c1aa4bf54ed2852d93a58ba8d49b549d5f46c -rd515de49557312e4af41b1c051c900d39d1f9e2f
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs	(.../PipingInputContextProperties.cs)	(revision 614c1aa4bf54ed2852d93a58ba8d49b549d5f46c)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingInputContextProperties.cs	(.../PipingInputContextProperties.cs)	(revision d515de49557312e4af41b1c051c900d39d1f9e2f)
@@ -33,6 +33,7 @@
 using Ringtoets.Piping.Forms.TypeConverters;
 using Ringtoets.Piping.Forms.UITypeEditors;
 using Ringtoets.Piping.Primitives;
+using Ringtoets.Piping.Service;
 
 namespace Ringtoets.Piping.Forms.PropertyClasses
 {
@@ -171,7 +172,7 @@
                 if (!ReferenceEquals(value, data.WrappedData.SurfaceLine))
                 {
                     data.WrappedData.SurfaceLine = value;
-                    data.SetStochasticSoilModelAndStochasticSoilProfileForSurfaceLine();
+                    PipingInputService.SetMatchingStochasticSoilModel(data.WrappedData, GetAvailableStochasticSoilModels());
                     data.WrappedData.NotifyObservers();
                 }
             }
@@ -192,6 +193,7 @@
                 if (!ReferenceEquals(value, data.WrappedData.StochasticSoilModel))
                 {
                     data.WrappedData.StochasticSoilModel = value;
+                    PipingInputService.SyncStochasticSoilProfileWithStochasticSoilModel(data.WrappedData);
                     data.WrappedData.NotifyObservers();
                 }
             }