diff --git a/public/app/plugins/datasource/graphite/lexer.ts b/public/app/plugins/datasource/graphite/lexer.ts
index 419f47448bd..a587fb8ae24 100644
--- a/public/app/plugins/datasource/graphite/lexer.ts
+++ b/public/app/plugins/datasource/graphite/lexer.ts
@@ -81,6 +81,7 @@ for (let i = 0; i < 128; i++) {
     i === 37 || // %
     i === 35 || // #
     i === 61 || // =
+    i === 64 || // @
     (i >= 97 && i <= 122); // a-z
 }