diff --git a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx
index 9b6b79fb0cc..3f4e4256c28 100644
--- a/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx
+++ b/public/app/plugins/datasource/influxdb/components/editor/query/influxql/visual/VisualInfluxQLEditor.tsx
@@ -82,11 +82,9 @@ export const VisualInfluxQLEditor = (props: Props): JSX.Element => {
   // is used in both memoized and un-memoized parts, so we have no choice
   const getTagKeys = useMemo(
     () => async () => {
-      const selectedTagKeys = new Set(query.tags?.map((tag) => tag.key));
-
-      return [...(await allTagKeys)].filter((tagKey) => !selectedTagKeys.has(tagKey));
+      return [...(await allTagKeys)];
     },
-    [query.tags, allTagKeys]
+    [allTagKeys]
   );
 
   const groupByList = useMemo(() => {