diff --git a/src/app/features/opentsdb/datasource.js b/src/app/features/opentsdb/datasource.js
index 58578a4d7c2..c8617d7a383 100644
--- a/src/app/features/opentsdb/datasource.js
+++ b/src/app/features/opentsdb/datasource.js
@@ -24,9 +24,9 @@ function (angular, _, kbn) {
     OpenTSDBDatasource.prototype.query = function(options) {
       var start = convertToTSDBTime(options.range.from);
       var end = convertToTSDBTime(options.range.to);
-      var qs = Array();
+      var qs = [];
       if (options.interval.match(/\.[0-9]+s/)) {
-        options.interval = parseFloat(options.interval)*1000 + "ms"
+        options.interval = parseFloat(options.interval)*1000 + "ms";
       }
       _.each(options.targets, function(target){
           qs.push(convertTargetToQuery(target, options.interval));
@@ -157,7 +157,8 @@ function (angular, _, kbn) {
       }
 
       if (target.shouldDownsample) {
-        query.downsample = templateSrv.replace(target.downsampleInterval ? target.downsampleInterval : interval ) + "-" + target.downsampleAggregator;
+        var buf =  target.downsampleInterval || interval;
+        query.downsample = templateSrv.replace(buf) + "-" + target.downsampleAggregator;
       }
 
       query.tags = angular.copy(target.tags);