diff --git a/public/app/plugins/datasource/elasticsearch/datasource.js b/public/app/plugins/datasource/elasticsearch/datasource.js
index f35547f25e5..3a3e81a1f74 100644
--- a/public/app/plugins/datasource/elasticsearch/datasource.js
+++ b/public/app/plugins/datasource/elasticsearch/datasource.js
@@ -239,6 +239,7 @@ function (angular, _, moment, kbn, ElasticQueryBuilder, IndexPattern, ElasticRes
           'date': 'date',
           'string': 'string',
           'text': 'text',
+          'scaled_float': 'number',
           'nested': 'nested'
         };