diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js
index f4680038e8d..5edf4329be0 100644
--- a/public/app/plugins/datasource/opentsdb/datasource.js
+++ b/public/app/plugins/datasource/opentsdb/datasource.js
@@ -276,7 +276,7 @@ function (angular, _, dateMath) {
 
         query.downsample = interval + "-" + target.downsampleAggregator;
 
-        if (target.downsampleFillPolicy !== "none") {
+        if (target.downsampleFillPolicy && target.downsampleFillPolicy !== "none") {
           query.downsample += "-" + target.downsampleFillPolicy;
         }
       }