diff --git a/public/app/plugins/datasource/tempo/language_provider.ts b/public/app/plugins/datasource/tempo/language_provider.ts
index bb2ada8d323..a56c7b4b2cc 100644
--- a/public/app/plugins/datasource/tempo/language_provider.ts
+++ b/public/app/plugins/datasource/tempo/language_provider.ts
@@ -121,11 +121,15 @@ export default class TempoLanguageProvider extends LanguageProvider {
     const response = await this.request(`/api/v2/search/tag/${tag}/values`, query ? { q: query } : {});
     let options: Array<SelectableValue<string>> = [];
     if (response && response.tagValues) {
-      options = response.tagValues.map((v: { type: string; value: string }) => ({
-        type: v.type,
-        value: v.value,
-        label: v.value,
-      }));
+      response.tagValues.forEach((v: { type: string; value?: string }) => {
+        if (v.value) {
+          options.push({
+            type: v.type,
+            value: v.value,
+            label: v.value,
+          });
+        }
+      });
     }
     return options;
   }