Index: src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs
===================================================================
diff -u -r382 -r385
--- src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 382)
+++ src/Deltares.DSoilModel.Forms.Tests/DSoilModelContextTest.cs	(.../DSoilModelContextTest.cs)	(revision 385)
@@ -20,7 +20,9 @@
         private readonly HashSet<string> excludedProperties = new HashSet<string>
         {
             "StressTableStochast",
-            "UseDefaultShearStrengthModel"
+            "UseDefaultShearStrengthModel",
+            "StressTable",
+            "BondStressTable"
         };
 
         private readonly HashSet<string> alwaysVisibleProperties = new HashSet<string>
Index: src/Deltares.DSoilModel.Forms/DSoilModelContext.cs
===================================================================
diff -u -r354 -r385
--- src/Deltares.DSoilModel.Forms/DSoilModelContext.cs	(.../DSoilModelContext.cs)	(revision 354)
+++ src/Deltares.DSoilModel.Forms/DSoilModelContext.cs	(.../DSoilModelContext.cs)	(revision 385)
@@ -158,9 +158,14 @@
                 }
             }
 
-            if (source is Soil)
+            var soil = source as Soil;
+            if (soil != null)
             {
-                if (member == "UseDefaultShearStrengthModel")
+                // For Wti version, stresstables are not to be used (DSB-506)
+                if (member == soil.GetMemberName(s => s.UseDefaultShearStrengthModel) ||
+                    member == soil.GetMemberName(s => s.StressTable) ||
+                    member == soil.GetMemberName(s => s.StressTableStochast) ||
+                    member == soil.GetMemberName(s => s.BondStressTable))
                 {
                     return false;
                 }
Index: src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs
===================================================================
diff -u -r372 -r385
--- src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs	(.../DSoilModelPlugin.cs)	(revision 372)
+++ src/Deltares.DSoilModel.Forms/DSoilModelPlugin.cs	(.../DSoilModelPlugin.cs)	(revision 385)
@@ -913,10 +913,6 @@
             mainForm.DynamicPropertyControl.BuildDelayedPropertyControlForTypes(() => PropertyControlFactory<BoringLayer>.GetPropertyControl(), typeof(BoringLayer));
             mainForm.DynamicPropertyControl.BuildDelayedPropertyControlForTypes(() => PropertyControlFactory<SoilSurfaceProfile>.GetPropertyControl(), typeof(SoilSurfaceProfile));
 
-            //BondStress controls will be initialized but not shown.
-            // to change that behaviour, manipulate IsVisible function in Soil.
-            mainForm.DynamicPropertyControl.BuildDelayedPropertyControlsForType(typeof(Soil), () => new SoilStressCurveControl(), () => new SoilBondStressCurveControl());
-
             // this should be in the geotechnics plugin, but may impact the MStab and RingToets applications that already have something else hooked up ?!
             mainForm.DynamicPropertyControl.BuildDelayedPropertyControlForTypes(() => new PreconsolidationStressControl(), typeof(SoilProfile2D));
 
@@ -1020,23 +1016,6 @@
                 BindSupport.Bind<DSoilModelProject>(projectPanel, segmentsTable, x => x.CurrentSoilSegments);
             }
 
-            // (bond)stress tables always visible as these are referenced from materials table
-            var stressCurvesTable = new GridViewControl
-            {
-                CurrentContext = Context.CurrentContext,
-                HideUnusedColumns = true
-            };
-            mainForm.RegisterTableControl(typeof(StressCurve), stressCurvesTable, "StressCurves");
-            BindSupport.Bind<DSoilModelProject>(projectPanel, stressCurvesTable, x => x.StressCurves);
-
-            var bondStressCurvesTable = new GridViewControl
-            {
-                CurrentContext = Context.CurrentContext,
-                HideUnusedColumns = true
-            };
-            mainForm.RegisterTableControl(typeof(BondStressCurve), bondStressCurvesTable, "BondStressCurves");
-            BindSupport.Bind<DSoilModelProject>(projectPanel, bondStressCurvesTable, x => x.BondStressCurves);
-
             // validator messages, add repair all button to toolbar
             var newButton = new BarButtonItem
             {