diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.js b/public/app/plugins/datasource/elasticsearch/query_builder.js
index ac61fe13a1e..d0fbb6a603a 100644
--- a/public/app/plugins/datasource/elasticsearch/query_builder.js
+++ b/public/app/plugins/datasource/elasticsearch/query_builder.js
@@ -15,15 +15,14 @@ function (angular) {
   };
 
   ElasticQueryBuilder.prototype.buildTermsAgg = function(aggDef, queryNode, target) {
-    var metricRef, metric, size, y;
+    var metricRef, metric, y;
     queryNode.terms = { "field": aggDef.field };
 
     if (!aggDef.settings) {
       return queryNode;
     }
 
-    size = parseInt(aggDef.settings.size, 10);
-    if (size > 0) { queryNode.terms.size = size; }
+    queryNode.terms.size = parseInt(aggDef.settings.size, 10);
     if (aggDef.settings.orderBy !== void 0) {
       queryNode.terms.order = {};
       queryNode.terms.order[aggDef.settings.orderBy] = aggDef.settings.order;