diff --git a/public/app/plugins/datasource/elasticsearch/hooks/useFields.test.tsx b/public/app/plugins/datasource/elasticsearch/hooks/useFields.test.tsx
index 5f12d0afc81..0af4be1bb55 100644
--- a/public/app/plugins/datasource/elasticsearch/hooks/useFields.test.tsx
+++ b/public/app/plugins/datasource/elasticsearch/hooks/useFields.test.tsx
@@ -60,6 +60,11 @@ describe('useFields hook', () => {
     result.current();
     expect(getFields).toHaveBeenLastCalledWith(['date'], timeRange);
 
+    // Histrogram only works on numbers
+    rerender('histogram');
+    result.current();
+    expect(getFields).toHaveBeenLastCalledWith(['number'], timeRange);
+
     // Geohash Grid only works on geo_point data
     rerender('geohash_grid');
     result.current();
diff --git a/public/app/plugins/datasource/elasticsearch/hooks/useFields.ts b/public/app/plugins/datasource/elasticsearch/hooks/useFields.ts
index 54cfb3b5cc4..780b3c89fad 100644
--- a/public/app/plugins/datasource/elasticsearch/hooks/useFields.ts
+++ b/public/app/plugins/datasource/elasticsearch/hooks/useFields.ts
@@ -34,6 +34,8 @@ const getFilter = (type: AggregationType) => {
         return ['date'];
       case 'geohash_grid':
         return ['geo_point'];
+      case 'histogram':
+        return ['number'];
       default:
         return [];
     }