diff --git a/public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx b/public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx
index 39e0d5a0821..0e956cd7e1b 100644
--- a/public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx
+++ b/public/app/plugins/datasource/grafana/components/AnnotationQueryEditor.tsx
@@ -88,7 +88,7 @@ export default function AnnotationQueryEditor({ query, onChange }: Props) {
           onChange={onMaxLimitChange}
         />
       </Field>
-      {type === GrafanaAnnotationType.Tags && tags && (
+      {type === GrafanaAnnotationType.Tags && (
         <>
           <Field label="Match any" description={matchTooltipContent}>
             <Switch id="grafana-annotations__match-any" value={matchAny} onChange={onMatchAnyChange} />
@@ -100,7 +100,7 @@ export default function AnnotationQueryEditor({ query, onChange }: Props) {
               inputId="grafana-annotations__tags"
               onChange={onTagsChange}
               tagOptions={getAnnotationTags}
-              tags={tags}
+              tags={tags ?? []}
             />
           </Field>
         </>