diff --git a/public/app/plugins/datasource/opentsdb/datasource.js b/public/app/plugins/datasource/opentsdb/datasource.js
index d5034ce271f..4ef7c9761fe 100644
--- a/public/app/plugins/datasource/opentsdb/datasource.js
+++ b/public/app/plugins/datasource/opentsdb/datasource.js
@@ -425,6 +425,10 @@ function (angular, _, dateMath) {
         }
       }
 
+      if (target.explicitTags) {
+        query.explicitTags = true;
+      }
+
       return query;
     }
 
diff --git a/public/app/plugins/datasource/opentsdb/partials/query.editor.html b/public/app/plugins/datasource/opentsdb/partials/query.editor.html
index 255e23c5701..a2db8a68840 100644
--- a/public/app/plugins/datasource/opentsdb/partials/query.editor.html
+++ b/public/app/plugins/datasource/opentsdb/partials/query.editor.html
@@ -249,6 +249,11 @@
 			</input>
 		</div>
 
+		<div class="gf-form" ng-if="ctrl.tsdbVersion > 2">
+			<gf-form-switch class="gf-form" label="Explicit tags" label-class="width-8 query-keyword" checked="ctrl.target.explicitTags" on-change="ctrl.targetBlur()">
+			</gf-form-switch>
+		</div>
+
 		<div class="gf-form gf-form--grow">
 			<div class="gf-form-label gf-form-label--grow"></div>
 		</div>