diff --git a/docs/reference/query-dsl/multi-match-query.asciidoc b/docs/reference/query-dsl/multi-match-query.asciidoc
index f4b097a1b8361..f035bc7a4e629 100644
--- a/docs/reference/query-dsl/multi-match-query.asciidoc
+++ b/docs/reference/query-dsl/multi-match-query.asciidoc
@@ -63,7 +63,9 @@ index settings, which in turn defaults to `*`. `*` extracts all fields in the ma
 are eligible to term queries and filters the metadata fields. All extracted fields are then
 combined to build a query.
 
-WARNING: There is a limit of no more than 1024 fields being queried at once.
+WARNING: If you have a huge number of fields, the above auto expansion might lead to
+querying a large number of felds which might cause performance issues. In future versions
+(stating in 7.0) there will be a limit of no more than 1024 fields that can be queried at once.
 
 [[multi-match-types]]
 [float]