diff --git a/public/app/features/templating/template_srv.ts b/public/app/features/templating/template_srv.ts
index 0db7b8e77e0..485d244e9ae 100644
--- a/public/app/features/templating/template_srv.ts
+++ b/public/app/features/templating/template_srv.ts
@@ -28,7 +28,7 @@ export class TemplateSrv {
     const existsOrEmpty = value => value || value === '';
 
     this.index = this.variables.reduce((acc, currentValue) => {
-      if (currentValue.current && !currentValue.current.isNone && existsOrEmpty(currentValue.current.value)) {
+      if (currentValue.current && (currentValue.current.isNone || existsOrEmpty(currentValue.current.value))) {
         acc[currentValue.name] = currentValue;
       }
       return acc;