diff --git a/public/app/features/templating/partials/editor.html b/public/app/features/templating/partials/editor.html
index 382790e0f21..b515f2a7535 100644
--- a/public/app/features/templating/partials/editor.html
+++ b/public/app/features/templating/partials/editor.html
@@ -228,7 +228,7 @@
 
 			<div class="editor-row" ng-if="current.type === 'query'">
 				<div class="tight-form-section">
-					<h5>Value groups/tags</h5>
+					<h5>Value groups/tags (Experimental feature)</h5>
 					<div class="tight-form" ng-if="current.useTags">
 						<ul class="tight-form-list">
 							<li class="tight-form-item" style="width: 135px">