diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js
index 27d4f001b0b..43b595371e3 100644
--- a/public/app/plugins/datasource/opentsdb/datasource.js
+++ b/public/app/plugins/datasource/opentsdb/datasource.js
@@ -78,7 +78,7 @@ function (angular, _, kbn) {
     };
 
     OpenTSDBDatasource.prototype._performSuggestQuery = function(query) {
-      return this._get('/api/suggest', {type: 'metrics', q: query}).then(function(result) {
+      return this._get('/api/suggest', {type: 'metrics', q: query, max: 1000}).then(function(result) {
         return result.data;
       });
     };