diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js
index 4a703798e15..e80c811a2a6 100644
--- a/public/app/plugins/datasource/opentsdb/datasource.js
+++ b/public/app/plugins/datasource/opentsdb/datasource.js
@@ -168,7 +168,9 @@ function (angular, _, dateMath) {
         return $q.when([]);
       }
 
-      var keysArray = keys.split(",");
+      var keysArray = keys.split(",").map(function(key) {
+        return key.trim();
+      });
       var key = keysArray[0];
       var keysQuery = key + "=*";
 
diff --git a/public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts b/public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts
index 5fdff3dea3b..1f63dc88667 100644
--- a/public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts
+++ b/public/app/plugins/datasource/opentsdb/specs/datasource-specs.ts
@@ -55,14 +55,14 @@ describe('opentsdb', function() {
       ctx.ds.metricFindQuery('tag_values(cpu, hostname, env=$env)').then(function(data) { results = data; });
       ctx.$rootScope.$apply();
       expect(requestOptions.url).to.be('/api/search/lookup');
-      expect(requestOptions.params.m).to.be('cpu{hostname=*, env=$env}');
+      expect(requestOptions.params.m).to.be('cpu{hostname=*,env=$env}');
     });
 
     it('tag_values(cpu, test) should generate lookup query', function() {
       ctx.ds.metricFindQuery('tag_values(cpu, hostname, env=$env, region=$region)').then(function(data) { results = data; });
       ctx.$rootScope.$apply();
       expect(requestOptions.url).to.be('/api/search/lookup');
-      expect(requestOptions.params.m).to.be('cpu{hostname=*, env=$env, region=$region}');
+      expect(requestOptions.params.m).to.be('cpu{hostname=*,env=$env,region=$region}');
     });
 
     it('suggest_tagk() should generate api suggest query', function() {