diff --git a/redash/query_runner/elasticsearch.py b/redash/query_runner/elasticsearch.py
index 6640b2c32..850b2f94d 100644
--- a/redash/query_runner/elasticsearch.py
+++ b/redash/query_runner/elasticsearch.py
@@ -115,7 +115,7 @@ class BaseElasticSearch(BaseQueryRunner):
                         property_type = property_data.get("type", None)
                         if property_type:
                             if property_type in ELASTICSEARCH_TYPES_MAPPING:
-                                mappings[property_name] = property_type
+                                mappings[property_name] = ELASTICSEARCH_TYPES_MAPPING[property_type]
                             else:
                                 mappings[property_name] = TYPE_STRING
                                 #raise Exception("Unknown property type: {0}".format(property_type))