diff --git a/public/app/plugins/datasource/elasticsearch/partials/metric_agg.html b/public/app/plugins/datasource/elasticsearch/partials/metric_agg.html
index cc2ec8e4918..b4a1a61ed32 100644
--- a/public/app/plugins/datasource/elasticsearch/partials/metric_agg.html
+++ b/public/app/plugins/datasource/elasticsearch/partials/metric_agg.html
@@ -74,7 +74,7 @@
   </div>
   <div class="gf-form offset-width-7" ng-if="agg.type === 'raw_document'">
     <label class="gf-form-label width-10">Size</label>
-    <input type="text" class="gf-form-input max-width-12" ng-model="agg.settings.size" ng-blur="onChange()"></input>
+    <input type="number" class="gf-form-input max-width-12" ng-model="agg.settings.size" ng-blur="onChange()"></input>
   </div>
 
 
diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.js b/public/app/plugins/datasource/elasticsearch/query_builder.js
index d753a2666c6..1493fd3eb95 100644
--- a/public/app/plugins/datasource/elasticsearch/query_builder.js
+++ b/public/app/plugins/datasource/elasticsearch/query_builder.js
@@ -110,7 +110,7 @@ function (queryDef) {
   };
 
   ElasticQueryBuilder.prototype.documentQuery = function(query, size) {
-    query.size = size === undefined ? 500 : parseInt(size , 10);
+    query.size = size === undefined ? 500 : size;
     query.sort = {};
     query.sort[this.timeField] = {order: 'desc', unmapped_type: 'boolean'};
 
diff --git a/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts b/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
index 201459e65d9..4ea108359a1 100644
--- a/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
+++ b/public/app/plugins/datasource/elasticsearch/specs/query_builder_specs.ts
@@ -165,7 +165,7 @@ describe('ElasticQueryBuilder', function() {
   });
   it('with raw_document metric size set', function() {
     var query = builder.build({
-      metrics: [{type: 'raw_document', id: '1',settings: {size: '1337'}}],
+      metrics: [{type: 'raw_document', id: '1',settings: {size: 1337}}],
       timeField: '@timestamp',
       bucketAggs: [],
     });