From f60b5ecec49e578484286df00ebd59c94eef7e3a Mon Sep 17 00:00:00 2001
From: Ryan McKinley <ryantxu@gmail.com>
Date: Fri, 9 Feb 2024 08:48:11 -0800
Subject: [PATCH] Chore: Avoid NPE with annotations query (#82216)

---
 public/app/plugins/datasource/grafana/datasource.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/app/plugins/datasource/grafana/datasource.ts b/public/app/plugins/datasource/grafana/datasource.ts
index 934eadf8708..698db42459d 100644
--- a/public/app/plugins/datasource/grafana/datasource.ts
+++ b/public/app/plugins/datasource/grafana/datasource.ts
@@ -216,7 +216,7 @@ export class GrafanaDatasource extends DataSourceWithBackend<GrafanaQuery> {
 
     if (target.type === GrafanaAnnotationType.Dashboard) {
       // if no dashboard id yet return
-      if (!options.dashboard.uid) {
+      if (!options.dashboard?.uid) {
         return Promise.resolve({ data: [] });
       }
       // filter by dashboard id