diff --git a/src/Nest/Analysis/TokenFilters/StandardTokenFilter.cs b/src/Nest/Analysis/TokenFilters/StandardTokenFilter.cs
index 1b9aef0c122..c746bd7ccac 100644
--- a/src/Nest/Analysis/TokenFilters/StandardTokenFilter.cs
+++ b/src/Nest/Analysis/TokenFilters/StandardTokenFilter.cs
@@ -1,17 +1,22 @@
-namespace Nest
+using System;
+
+namespace Nest
{
///
/// A token filter of type standard that normalizes tokens extracted with the Standard Tokenizer.
///
+ [Obsolete(" The `standard` token filter has been deprecated because it doesn't change anything in the stream. It will be removed in 7.0.")]
public interface IStandardTokenFilter : ITokenFilter { }
///
+ [Obsolete(" The `standard` token filter has been deprecated because it doesn't change anything in the stream. It will be removed in 7.0.")]
public class StandardTokenFilter : TokenFilterBase, IStandardTokenFilter
{
public StandardTokenFilter() : base("standard") { }
}
///
+ [Obsolete(" The `standard` token filter has been deprecated because it doesn't change anything in the stream. It will be removed in 7.0.")]
public class StandardTokenFilterDescriptor
: TokenFilterDescriptorBase, IStandardTokenFilter
{
diff --git a/src/Nest/Analysis/TokenFilters/TokenFilterJsonConverter.cs b/src/Nest/Analysis/TokenFilters/TokenFilterJsonConverter.cs
index ab43f823164..ce17a4d4f71 100644
--- a/src/Nest/Analysis/TokenFilters/TokenFilterJsonConverter.cs
+++ b/src/Nest/Analysis/TokenFilters/TokenFilterJsonConverter.cs
@@ -47,7 +47,9 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist
case "stemmer": return o.ToObject(ElasticContractResolver.Empty);
case "stemmer_override": return o.ToObject(ElasticContractResolver.Empty);
case "stop": return o.ToObject(ElasticContractResolver.Empty);
+#pragma warning disable 618
case "standard": return o.ToObject(ElasticContractResolver.Empty);
+#pragma warning restore 618
case "synonym": return o.ToObject(ElasticContractResolver.Empty);
case "synonym_graph": return o.ToObject(ElasticContractResolver.Empty);
case "trim": return o.ToObject(ElasticContractResolver.Empty);
diff --git a/src/Nest/Analysis/TokenFilters/TokenFilters.cs b/src/Nest/Analysis/TokenFilters/TokenFilters.cs
index 55a04c40424..4fb95d3ce17 100644
--- a/src/Nest/Analysis/TokenFilters/TokenFilters.cs
+++ b/src/Nest/Analysis/TokenFilters/TokenFilters.cs
@@ -214,8 +214,10 @@ public TokenFiltersDescriptor Snowball(string name, Func
/// A token filter of type standard that normalizes tokens extracted with the Standard Tokenizer.
///
+#pragma warning disable 618
public TokenFiltersDescriptor Standard(string name, Func selector = null) =>
Assign(name, selector.InvokeOrDefault(new StandardTokenFilterDescriptor()));
+#pragma warning restore 618
///
/// A filter that stems words (similar to snowball, but with more options).
diff --git a/src/Nest/Indices/Analyze/AnalyzeTokenFilters.cs b/src/Nest/Indices/Analyze/AnalyzeTokenFilters.cs
index 439644d1e56..ea43995bc8f 100644
--- a/src/Nest/Indices/Analyze/AnalyzeTokenFilters.cs
+++ b/src/Nest/Indices/Analyze/AnalyzeTokenFilters.cs
@@ -236,8 +236,10 @@ public AnalyzeTokenFiltersDescriptor Snowball(Func
/// A token filter of type standard that normalizes tokens extracted with the Standard Tokenizer.
///
+#pragma warning disable 618
public AnalyzeTokenFiltersDescriptor Standard(Func selector = null) =>
AssignIfNotNull(selector.InvokeOrDefault(new StandardTokenFilterDescriptor()));
+#pragma warning restore 618
///
/// A filter that stems words (similar to snowball, but with more options).
diff --git a/src/Tests/Tests/Analysis/TokenFilters/TokenFilterTests.cs b/src/Tests/Tests/Analysis/TokenFilters/TokenFilterTests.cs
index 5d216042d4c..6f649e6509f 100644
--- a/src/Tests/Tests/Analysis/TokenFilters/TokenFilterTests.cs
+++ b/src/Tests/Tests/Analysis/TokenFilters/TokenFilterTests.cs
@@ -561,7 +561,9 @@ public class StandardTests : TokenFilterAssertionBase
{
public override FuncTokenFilters Fluent => (n, tf) => tf.Standard(n);
+#pragma warning disable 618
public override ITokenFilter Initializer => new StandardTokenFilter();
+#pragma warning restore 618
public override object Json => new { type = "standard" };
public override string Name => "standard";