diff --git a/src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs b/src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
index ba1df58879..7a4ca5654c 100644
--- a/src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
+++ b/src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
@@ -48,8 +48,10 @@ namespace Umbraco.Core.PropertyEditors
         private static List<PropertyEditor> SanitizeNames(List<PropertyEditor> editors)
         {
             var nestedContentEditorFromPackage = editors.FirstOrDefault(x => x.Alias == "Our.Umbraco.NestedContent");
-            if (nestedContentEditorFromPackage != null)
+            if (nestedContentEditorFromPackage != null) { 
                 nestedContentEditorFromPackage.Name = "(Obsolete) " + nestedContentEditorFromPackage.Name;
+                nestedContentEditorFromPackage.IsDeprecated = true;
+            }
             return editors;
 
         }
@@ -74,4 +76,4 @@ namespace Umbraco.Core.PropertyEditors
             return PropertyEditors.SingleOrDefault(x => x.Alias == alias);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Umbraco.Web/Editors/DataTypeController.cs b/src/Umbraco.Web/Editors/DataTypeController.cs
index d42b158cfb..8b070b8e1f 100644
--- a/src/Umbraco.Web/Editors/DataTypeController.cs
+++ b/src/Umbraco.Web/Editors/DataTypeController.cs
@@ -20,6 +20,7 @@ using umbraco;
 using Constants = Umbraco.Core.Constants;
 using System.Net.Http;
 using System.Text;
+using Umbraco.Core.Configuration;
 
 namespace Umbraco.Web.Editors
 {
@@ -340,9 +341,11 @@ namespace Umbraco.Web.Editors
             Constants.Applications.Settings, Constants.Applications.Developer)]
         public IDictionary<string, IEnumerable<DataTypeBasic>> GetGroupedPropertyEditors()
         {
-            var datatypes = new List<DataTypeBasic>();
+            var datatypes = new List<DataTypeBasic>();
+            var showDeprecatedPropertyEditors = UmbracoConfig.For.UmbracoSettings().Content
+                .ShowDeprecatedPropertyEditors;
 
-            var propertyEditors = PropertyEditorResolver.Current.PropertyEditors;
+            var propertyEditors = PropertyEditorResolver.Current.PropertyEditors.Where(x=>x.IsDeprecated == false || showDeprecatedPropertyEditors);
             foreach (var propertyEditor in propertyEditors)
             {
                 var hasPrevalues = propertyEditor.PreValueEditor.Fields.Any();
@@ -377,4 +380,4 @@ namespace Umbraco.Web.Editors
         }
         #endregion
     }
-}
\ No newline at end of file
+}