diff --git a/lib/logstash/outputs/elasticsearch/elasticsearch-template.json b/lib/logstash/outputs/elasticsearch/elasticsearch-template.json
index 74983cb15..8926b0bdc 100644
--- a/lib/logstash/outputs/elasticsearch/elasticsearch-template.json
+++ b/lib/logstash/outputs/elasticsearch/elasticsearch-template.json
@@ -21,7 +21,7 @@
            "mapping" : {
              "type" : "multi_field",
                "fields" : {
-                 "{name}" : {"type": "string", "index" : "analyzed", "omit_norms" : true, "fielddata" : {"format": "disabled"}},
+                 "{name}" : {"type": "string", "index" : "analyzed", "omit_norms" : true },
                  "raw" : {"type": "string", "index" : "not_analyzed", "ignore_above" : 256}
                }
            }