diff --git a/public/app/plugins/datasource/graphite/datasource.ts b/public/app/plugins/datasource/graphite/datasource.ts
index d658ba8286e..56a061bc1a4 100644
--- a/public/app/plugins/datasource/graphite/datasource.ts
+++ b/public/app/plugins/datasource/graphite/datasource.ts
@@ -302,13 +302,11 @@ export function GraphiteDatasource(instanceSettings, $q, backendSrv, templateSrv
       method: 'GET',
       url: '/tags/autoComplete/values',
       params: {
-        expr: expression
+        expr: expression,
+        tag: tag
       }
     };
 
-    if (tag) {
-      httpOptions.params.tag = tag;
-    }
     if (valuePrefix) {
       httpOptions.params.valuePrefix = valuePrefix;
     }