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