diff --git a/public/app/plugins/datasource/elasticsearch/metric_agg.js b/public/app/plugins/datasource/elasticsearch/metric_agg.js
index 9971c084882..c0c4ffc08d4 100644
--- a/public/app/plugins/datasource/elasticsearch/metric_agg.js
+++ b/public/app/plugins/datasource/elasticsearch/metric_agg.js
@@ -162,6 +162,9 @@ function (angular, _, queryDef) {
     };
 
     $scope.getFieldsInternal = function() {
+      if ($scope.agg.type === 'cardinality') {
+        return $scope.getFields();
+      }
       return $scope.getFields({$fieldType: 'number'});
     };